helpdesk 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62e85c661007c0b041b84eda3f4684badff4f8bf
-  data.tar.gz: b4f734ee1cc0ae6b2f901dada3651c49772f762b
+  metadata.gz: 3de15e09a8fa89ce2f0ad4e71245b6bf51c29c5f
+  data.tar.gz: d4071186fc44ba53952a7c1875db4bc1c5a94081
 SHA512:
-  metadata.gz: 9febdcbe515758f101a7605a8a017a0ba2b4738353bf9c773058217df5ad21d5ae052c3e52f3034b11c5f92119aec1a361e2361cb2874669c72cd3e028b95ba6
-  data.tar.gz: 48f8b2a52ef4932301367efeec8ad0f18f18f7e44778577be3dd0bd37630bddeade3a78a2f8d6239bd413465bf83fa9e0875913fa6c6408b2e0e5f47238bb6a1
+  metadata.gz: 6165cf2a2673f78627a432b5fe12f1387c056ebbbae507e59d0507273e39e3cf024420dcd873d5930fc3fd998033e1c9b43f0f6e4f29bc1228333ccc6a241f4a
+  data.tar.gz: 5003f8c0923b7fe7433198cd3127bdb69738511e585d69bfe5b1ab80b9774a6228eed4d050bce67c42f6fd5b4a86c669ed3149f40167fd6a2e80970b52a3be79

data/app/controllers/helpdesk/admin/base_controller.rb

@@ -1,6 +1,6 @@
 module Helpdesk
   module Admin
-    class BaseController < ::ApplicationController
+    class BaseController < Helpdesk::ApplicationController
 
       helper Helpdesk::Engine.helpers
       # helper Helpdesk::ApplicationHelper

data/app/controllers/helpdesk/admin/tickets_controller.rb

@@ -2,16 +2,18 @@ class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
 
   def index
     if params[:tickets] == 'unassigned'
-      @tickets = Helpdesk::Ticket.unassigned
+      @tickets = Helpdesk::Ticket.unassigned.scoped
     elsif params[:tickets] == 'closed'
-      @tickets = Helpdesk::Ticket.closed
+      @tickets = Helpdesk::Ticket.closed.scoped
     elsif params[:tickets] == 'active'
-      @tickets = Helpdesk::Ticket.active
+      @tickets = Helpdesk::Ticket.active.scoped
     elsif params[:tickets] == 'all'
-      @tickets = Helpdesk::Ticket.all
+      @tickets = Helpdesk::Ticket.all.scoped
     else
-      @tickets = my_tickets.active
+      @tickets = my_tickets.active.scoped
     end
+    @tickets = @tickets.page(params[:page])
+
     render 'list'
   end
 

data/app/controllers/helpdesk/application_controller.rb

@@ -1,9 +1,9 @@
 module Helpdesk
-  class ApplicationController < ::ApplicationController
+  class ApplicationController < ApplicationController
     before_filter :ensure_user, :if => Proc.new { Helpdesk.require_user }
-    
+
     helper Helpdesk::Engine.helpers
-    
+
 
 
     layout 'helpdesk/user'
@@ -14,11 +14,15 @@ module Helpdesk
       end
     end
 
-    def helpdesk_admin?
-      helpdesk_user && (can? :manage, 'helpdesk')
+    def default_url_options(options={})
+      { :locale => I18n.locale}
     end
-    helper_method :helpdesk_admin?
-    
+
+    # def helpdesk_admin?
+    #   helpdesk_user && (can? :manage, 'helpdesk')
+    # end
+    # helper_method :helpdesk_admin?
+
 
 
   end

data/app/controllers/helpdesk/tickets_controller.rb

@@ -1,5 +1,5 @@
 module Helpdesk
-  class TicketsController < ApplicationController
+  class TicketsController < Helpdesk::ApplicationController
     # GET /tickets
     # GET /tickets.json
     def index
@@ -22,7 +22,7 @@ module Helpdesk
     # GET /tickets/1.json
     def show
       @tickets_count = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).active.count
-      @ticket = Ticket.find(params[:id])
+      @ticket = Helpdesk::Ticket.find(params[:id])
 
       respond_to do |format|
         format.html # show.html.erb
@@ -34,7 +34,7 @@ module Helpdesk
     # GET /tickets/new.json
     def new
       @tickets_count = Helpdesk::Ticket.where(:requester_id => helpdesk_user.id).active.count
-      @ticket = Ticket.new
+      @ticket = Helpdesk::Ticket.new
       @ticket.status = Helpdesk::Ticket::STATUSES[0][0]
 
       respond_to do |format|
@@ -45,13 +45,13 @@ module Helpdesk
 
     # GET /tickets/1/edit
     def edit
-      @ticket = Ticket.find(params[:id])
+      @ticket = Helpdesk::Ticket.find(params[:id])
     end
 
     # POST /tickets
     # POST /tickets.json
     def create
-      @ticket = Ticket.new(params[:ticket])
+      @ticket = Helpdesk::Ticket.new(params[:ticket])
       @ticket.requester = helpdesk_user
       @ticket.status = Helpdesk::Ticket::STATUSES[0][0]
 
@@ -69,7 +69,7 @@ module Helpdesk
     # PUT /tickets/1
     # PUT /tickets/1.json
     def update
-      @ticket = Ticket.find(params[:id])
+      @ticket = Helpdesk::Ticket.find(params[:id])
 
       respond_to do |format|
         if @ticket.update_attributes(params[:ticket])

data/app/models/helpdesk/ticket.rb

@@ -62,7 +62,7 @@ module Helpdesk
 
       new_subject = "#{sprintf '%02d',time.year-2000}#{sprintf '%02d',time.month}#{sprintf '%02d',time.day}"
 
-      day_num = Sugestion.where(created_at: Date.today.beginning_of_day..Date.today.end_of_day).count+1
+      day_num = Helpdesk::Ticket.where(created_at: Date.today.beginning_of_day..Date.today.end_of_day).count+1
       new_subject += "-#{sprintf '%04d',day_num}: "
       self.subject = new_subject + subject.to_s
       self.subject.strip!

data/app/views/helpdesk/admin/tickets/index.html.haml

@@ -8,7 +8,7 @@
 
 %table.table.table-hover
   %thead
-    %tr 
+    %tr
       %th= t('helpdesk.status')
       %th ID
       %th Issue Type
@@ -16,7 +16,7 @@
       %th Requester
       %th Requested
       %th Assignee
-      %th 
+      %th
 
   %tbody
     - @tickets.each do |ticket|
@@ -29,12 +29,14 @@
         %td
           - if ticket.requester
             = ticket.requester.send Helpdesk.display_user.to_sym
-            %br 
+            %br
             = ticket.requester.phone
-            %br 
+            %br
             = ticket.requester.email
         %td= I18n::l(ticket.created_at, :format=>:short)
         %td= ticket.assignee if ticket.assignee
         %td= link_to 'Show', admin_ticket_url(ticket)
 %br
 
+= paginate @tickets
+

data/app/views/helpdesk/admin/tickets/list.html.haml

@@ -14,4 +14,5 @@
 
 - @tickets.each do |ticket|
   = render 'ticket', ticket: ticket, show_button:true
-  
+
+= paginate @tickets

data/app/views/helpdesk/tickets/_form.html.haml

@@ -8,26 +8,26 @@
           - @ticket.errors.full_messages.each do |msg|
             %li
               = msg
-    / = f.input :subject 
+    / = f.input :subject
     / = f.input :ticket_type_id, collection: Helpdesk::TicketType.active, include_blank: false
     %div.subject
       %input{:value=>@ticket.subject,:name=>"ticket[subject]",:type => "text",:placeholder => t('helpdesk.tickets.subject')}
       %select{:name=>"ticket[ticket_type_id]"}
-        - SugestionType.all.each do |type|
+        - Helpdesk::TicketType.all.each do |type|
           %option{:value=>type.id, selected: type.id == @ticket.ticket_type_id}
-            = type.get_name
-    
+            = type.title
+
     - if @ticket.new_record?
       %div.content
         %textarea{:value=>@ticket.description,:name=>"ticket[description]",:type => "text",:placeholder => t('helpdesk.tickets.description')}
     - else
       = @ticket.description
-      
+
       = f.simple_fields_for :comments do |tickets_form|
         - unless tickets_form.object.persisted?
-          = tickets_form.input :comment 
-          = tickets_form.input :public, :hint => 'Requester can see this comment (public comment)' 
-          = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id } 
+          = tickets_form.input :comment
+          = tickets_form.input :public, :hint => 'Requester can see this comment (public comment)'
+          = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id }
     %hr
     %div.textRight
       %a#feedbackCancel{:class=>"btn white"}

data/app/views/helpdesk/tickets/_ticket.html.haml

@@ -51,4 +51,4 @@
     %tr{:class=>ticket.ticket_type.tr_class}
       %td{colspan:2}
         - if show_button
-          = link_to ticket.subject, ticket_url(ticket), class: 'btn btn-block'
+          = link_to ticket.subject, ticket_url(I18n.locale,ticket), class: 'btn btn-block'

data/config/initializers/globalize.rb

@@ -0,0 +1,4 @@
+Globalize.fallbacks = {
+    :en => [:en, :pl],
+    :pl => [:pl, :en],
+  }

data/config/locales/helpdesk.en.yml

@@ -1,7 +1,80 @@
 en:
 
   helpdesk:
-    name: Helpdesk Foo
-    new_ticket: New Ticket
-    my_tickets: My Tickets
+    Show: Show
+    edit: Edit
+    Destroy: Delete
+    name: Helpdesk
+    new_ticket: New
+    tickets:
+      new: New Issue
+      my: My Issue
+      unassigned: Wnassigned
+      closed: Closed Issues
+      all: All issues
+      title: Issues
+      active: Active Issues
+      assignee_to: Assigned to
+      assign_me: I take it
+      not_assigned: Not assigned
+      is_now_assigned: "Issue % {subject} has been assigned to you"
+      visible_to_autor: Visible to the author - send an email
+      you_have_no_tickets: "No issues "
+      ticket_closed: Issues closed
+      subject: Subject of
+      Description: Content
+    ticket: Issue
+    comments:
+      title: Comments
+      note: Memo
+      send: Sent
+      received: Received
+      note: note
+      author: Re. author
+      helpdesk: Re. BOK
+    ticket_types:
+      title: Types of issues
+      new: A new type of issues
+      all: All kinds of issues
+      active: Active types of issues
+      inactive: Inactive types of issues
 
+    dashboard: Dashboard
+
+    subscribers:
+      title: Subscribers
+      confirmed: Confirmed subskrybenci
+      unconfirmed: Unconfirmed
+      all: All Subscribers
+      new: Add Subscriber
+
+    faqs:
+      title: FAQ
+      active: Active Questions
+      inactive: Inactive questions
+      all: All the questions
+      new: New Question
+      by: by
+      faq:
+        active: active
+        inactive: inactive
+
+
+
+  activerecord:
+    models:
+      Helpdesk: helpdesk
+      helpdesk/ticket: Issue
+      helpdesk/comment: Comment
+    attributes:
+      helpdesk/comment:
+        comment: Additional description
+        public: Visible/Send Email
+      helpdesk/ticket:
+        requester_id: Requester
+        subject: Subject
+        Status: Status
+        assignee_id: Assigned
+        ticket_type_id: Type of notification
+        Description: Description
+        comments: More details

data/config/locales/helpdesk.pl.yml

@@ -29,7 +29,7 @@ pl:
       note: Notatka
       send: Wysłane
       received: Odebrane
-      note: notatka 
+      note: notatka
       author: Odp. autora
       helpdesk: Odp. BOK
     ticket_types:
@@ -41,12 +41,12 @@ pl:
 
     dashboard: Dashboard
 
-    subscribers: 
-      title: Subskrynenci
+    subscribers:
+      title: Subskrybenci
       confirmed: Potwierdzeni subskrynenci
       unconfirmed: Niepotwierdzeni
-      all: Wszyscy subskrynenci
-      new: Dodaj subskrynenta
+      all: Wszyscy subskrybenci
+      new: Dodaj subskrybenta
 
     faqs:
       title: FAQ

data/config/routes.rb

@@ -1,7 +1,6 @@
 Helpdesk::Engine.routes.draw do
-
+# Rails.application.routes.draw do
   scope "(:locale)", :locale => /pl|en/ do
-
     # Admin only roots
     namespace :admin do
       resources :tickets do
@@ -14,6 +13,7 @@ Helpdesk::Engine.routes.draw do
       resources :subscribers
       root :to => "dashboard#index"
     end
+
     resources :faqs, :only => [ :index ]
     resources :tickets, :except => [ :edit, :destroy ]
     root :to => "tickets#index"

data/db/migrate/20130521105605_create_helpdesk_ticket_types.rb

@@ -3,10 +3,29 @@ class CreateHelpdeskTicketTypes < ActiveRecord::Migration
     create_table :helpdesk_ticket_types do |t|
       t.integer :position
       t.boolean :active,:default=>1,:null=>false
-
+      t.string :tr_class
       t.timestamps
     end
     Helpdesk::TicketType.create_translation_table! :title => :string
+
+
+    tt = [["Sugestia","Sugestion","warning"],
+          ["Pochwała","Appreciation","success"],
+          ["Błąd","Complaint","error"],
+          ["Pytanie","Enquiry","info"],
+          ["Kontakt","Contact","contact"]]
+
+    tt.each do |item|
+      I18n.locale = :pl
+      type = Helpdesk::TicketType.new
+      type.title = item[0]
+      I18n.locale = :en
+      type.title = item[1]
+      type.tr_class = item[2]
+      type.active = true
+      type.save!
+    end
+
   end
 
   def down

data/lib/generators/helpdesk/install_generator.rb

@@ -19,6 +19,18 @@ module Helpdesk
       def show_readme
         readme "README" if behavior == :invoke
       end
+
+
+
+      def add_engine_to_route
+        route "mount Helpdesk::Engine, :at => '/helpdesk'"
+      end
+
+      def run_rake
+        rake "helpdesk:install:migrations"
+        rake "db:migrate"
+      end
+
     end
   end
 end

data/lib/generators/helpdesk/templates/README

@@ -5,24 +5,19 @@ You need to do some manual setup to get Helpdesk working:
 1.  Review settings in new config/initializers/helpdesk.rb and update where
     neccessary.
 
-2.  Mount the engine into your application by editing your config/routes.rb
-
-    mount Helpdesk::Engine, :at => "support"
-
-3.  Install and run the migrations
-
-    rake helpdesk:install:migrations
-
-    rake db:migrate
-
-4.  Add a helpdesk_user method to your applications application_controller.rb
+2.  Add a helpdesk_user & helpdesk_admin method to your applications application_controller.rb
     that exposes your current_user
 
     Example, for devise gem:
-    def helpdesk_user
-      current_user
-    end
+        helper_method :helpdesk_user
+        def helpdesk_user
+          current_user
+        end
+
+        def helpdesk_admin?
+          current_user.admin?
+        end
 
-5.
+3.  Notnihg to do! Yey!
 
 ===============================================================================

data/lib/helpdesk/version.rb

@@ -1,3 +1,3 @@
 module Helpdesk
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helpdesk
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - John Beynon Wacław Łuczak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -168,16 +168,16 @@ dependencies:
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.2.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +276,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Helpesk includes: tickets, ticket_types, faq, subscribers'
 email:
 - john@beynon.org.uk, waclaw@luczak.it
@@ -374,6 +388,7 @@ files:
 - app/views/layouts/helpdesk/_topuser.html.haml
 - app/views/layouts/helpdesk/admin.html.haml
 - app/views/layouts/helpdesk/user.html.haml
+- config/initializers/globalize.rb
 - config/initializers/simple_form.rb
 - config/locales/helpdesk.en.yml
 - config/locales/helpdesk.pl.yml
@@ -384,7 +399,6 @@ files:
 - db/migrate/20120420104051_create_helpdesk_tickets.rb
 - db/migrate/20120423113938_create_helpdesk_comments.rb
 - db/migrate/20130521105605_create_helpdesk_ticket_types.rb
-- db/migrate/20130521132216_add_tr_class_to_ticket_type.rb
 - db/migrate/20130522085614_create_helpdesk_faqs.rb
 - db/migrate/20130522090420_create_helpdesk_subscribers.rb
 - lib/generators/helpdesk/install_generator.rb
@@ -417,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Rails mountable engine providing basic helpdesk functionality for your applications

data/db/migrate/20130521132216_add_tr_class_to_ticket_type.rb

@@ -1,5 +0,0 @@
-class AddTrClassToTicketType < ActiveRecord::Migration
-  def change
-    add_column :helpdesk_ticket_types, :tr_class, :string
-  end
-end