helpdesk 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1baf95cd67d35dfd2282f81c97c6f240f6a141df
-  data.tar.gz: 380842fdb392db3608dec6fa0aaee3ff3eadd3c3
+  metadata.gz: c2bb016f583e835252086dd3e6af2944dd1faf46
+  data.tar.gz: 530b21639f6552c52b5ecb16311d9dd6b841608f
 SHA512:
-  metadata.gz: 763a7c13219a8f4c06a3e99613ff620a890b00e3a48ca81d35b3be2a08584c0e1f70ddfb67fdafcafe299a3cb3337975bf2f1cb28aec0214f16adecdb74e8eef
-  data.tar.gz: 60debde9ac2c8a7ecf9c88ae92e0ca0b2ffc40f5964701d9adc01ef6cff1deb1e522ea90cb99e0f00eaad436c13cb71959370d91308539c8cdb103ac9d6b41b0
+  metadata.gz: 570524960d897ebd88eca5cfa53df9773343348e3db4c78c71fe7fd1bb6c082e3581b2ab9165aec5bf6f472a88a6dcc302597f5de086f9c398823f76c7b1c560
+  data.tar.gz: 30edbf3d805a7a9480d0e0965ae09c3dfe5d0f69eca31d6a40a779649e00d6fb7eb88efd7cac27aed8f4aabc50949bbb59e739dab0729135bd044beb06a18f24

data/app/models/helpdesk/comment.rb

@@ -13,10 +13,10 @@ module Helpdesk
     def send_email
       if self.public?
         if ticket.requester == author
-          Helpdesk::NotificationsMailer.comment_by_requester_notification(self).deliver
+          Helpdesk::NotificationsMailer.comment_by_requester_notification(self).deliver if ticket.requester
           Helpdesk::NotificationsMailer.comment_by_requester_confirmation(self).deliver if Helpdesk.send_confirmation_emails
         else
-          Helpdesk::NotificationsMailer.comment_by_helpdesk_notification(self).deliver
+          Helpdesk::NotificationsMailer.comment_by_helpdesk_notification(self).deliver if ticket.requester
           Helpdesk::NotificationsMailer.comment_by_helpdesk_confirmation(self).deliver if Helpdesk.send_confirmation_emails
         end
       end

data/app/models/helpdesk/ticket.rb

@@ -25,7 +25,7 @@ module Helpdesk
     belongs_to :requester, :class_name => Helpdesk.user_class.to_s
     belongs_to :assignee, :class_name => Helpdesk.user_class.to_s
     belongs_to :ticket_type, :class_name => Helpdesk::TicketType
-    has_many :comments, :order => "created_at DESC"
+    has_many :comments, :order => "created_at DESC",:dependent => :destroy
 
 
 

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

@@ -7,17 +7,17 @@
         - @ticket.errors.full_messages.each do |msg|
           %li
             = msg
-  = f.input :requester_id, :collection => User.all
-  = f.input :subject 
+  = f.input :requester_id, :collection => (Helpdesk.user_class).all,:label_method=>Helpdesk.display_user_uniq_info.to_sym
+  = f.input :subject
   = f.input :status, :collection => Helpdesk::Ticket::STATUS_OPTIONS, include_blank: false
-  = f.input :assignee_id, :collection => User.where('helpdesk_admin = ?', true) 
+  = f.input :assignee_id, :collection => User.where('helpdesk_admin = ?', true)
   = f.input :ticket_type_id, :collection => Helpdesk::TicketType.active,include_blank: false
   - if @ticket.new_record?
-    = f.input :description 
+    = f.input :description
   - else
     = simple_format @ticket.description
-    
-  
+
+
   %div.form-actions
     = f.button :submit, :class => 'btn-primary'
     = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"

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

@@ -2,30 +2,29 @@
   %tbody
     %tr{:class=>ticket.ticket_type.tr_class}
       %td{colspan:2}
-        %h4  
+        %h4
           ="##{ticket.subject}"
     %tr
-      %td{style:'width:100px'}  
+      %td{style:'width:100px'}
         = I18n::l(ticket.created_at, :format=>:short)
         - if ticket.requester
-          = ticket.requester.send Helpdesk.display_user.to_sym
+          = ticket.requester.send Helpdesk.display_user_uniq_info.to_sym
       %td{rowspan:2}
         = status_label Helpdesk::Ticket::STATUS_BY_KEY[ticket.status.to_sym], Helpdesk::Ticket::STATUS_CLASS_BY_KEY[ticket.status.to_sym]
         = ticket.ticket_type.title
-
-        = simple_format ticket.description
+        = auto_link(simple_format(ticket.description), :html => { :target => "_blank" })
     %tr
       %td
         - if ticket.assignee
           = t('helpdesk.tickets.assignee_to')
-          = ticket.assignee.send Helpdesk.display_user.to_sym
+          = ticket.assignee.send Helpdesk.display_user_uniq_info.to_sym
         - else
           = t('helpdesk.tickets.not_assigned')
           = link_to ico('star','white') + t('helpdesk.tickets.assign_me'), assign_admin_ticket_path(ticket),class: 'btn btn-mini btn-info'
     %tr
       %td
         %span.btn.disabled
-          = ico('comment') 
+          = ico('comment')
           = ticket.comments.size
       %td
         %ul.comments.unstyled
@@ -43,18 +42,17 @@
                 %div.comment-header
                   -if comment.author == ticket.requester
                     = status_label ico('user','white')+ t('helpdesk.comments.author'),'label-info'
-                    
-                  = comment.author.send Helpdesk.display_user.to_sym
+                  = comment.author.send Helpdesk.display_user_uniq_info.to_sym if comment.author
                   %small
                     = time_ago_in_words(comment.created_at)
                     temu
                 %div.comment-body
-                  = simple_format comment.comment
-  
+                  = auto_link(simple_format(comment.comment), :html => { :target => "_blank" })
+
     %tr{:class=>ticket.ticket_type.tr_class}
       %td{colspan:2}
         - if show_button
           = link_to 'Show', admin_ticket_url(ticket), class: 'btn btn-block'
         -elsif edit_button
           = link_to 'Edit', edit_admin_ticket_url(ticket), class: 'btn btn-primary'
-          
+

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

@@ -22,7 +22,7 @@
           -if comment.author == @ticket.requester
             = status_label ico('user','white')+ t('helpdesk.comments.author'),'label-info'
             
-          = comment.author.send Helpdesk.display_user.to_sym
+          = comment.author.send Helpdesk.display_user.to_sym if comment.author
           %small
             = time_ago_in_words(comment.created_at)
             temu

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

@@ -2,10 +2,10 @@
   %tbody
     %tr{:class=>ticket.ticket_type.tr_class}
       %td{colspan:2}
-        %h4  
+        %h4
           ="##{ticket.subject}"
     %tr
-      %td{style:'width:100px'}  
+      %td{style:'width:100px'}
         = I18n::l(ticket.created_at, :format=>:short)
         - if ticket.requester
           = ticket.requester.send Helpdesk.display_user.to_sym
@@ -13,7 +13,7 @@
         = status_label Helpdesk::Ticket::STATUS_BY_KEY[ticket.status.to_sym], Helpdesk::Ticket::STATUS_CLASS_BY_KEY[ticket.status.to_sym]
         = ticket.ticket_type.title
 
-        = simple_format ticket.description
+        = auto_link(simple_format(ticket.description), :html => { :target => "_blank" })
     %tr
       %td
         - if ticket.assignee
@@ -22,7 +22,7 @@
     %tr
       %td
         %span.btn.disabled
-          = ico('comment') 
+          = ico('comment')
           = ticket.comments.pub.size
       %td
         %ul.comments.unstyled
@@ -40,14 +40,14 @@
                 %div.comment-header
                   -if comment.author != ticket.requester
                     = status_label ico('user','white')+ t('helpdesk.comments.helpdesk'),'label-info'
-                    
+
                   = comment.author.send Helpdesk.display_user.to_sym
                   %small
                     = time_ago_in_words(comment.created_at)
                     temu
                 %div.comment-body
-                  = simple_format comment.comment
-  
+                  = auto_link(simple_format(comment.comment), :html => { :target => "_blank" })
+
     %tr{:class=>ticket.ticket_type.tr_class}
       %td{colspan:2}
         - if show_button

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

@@ -2,16 +2,20 @@
 
 = render 'ticket', :ticket=>@ticket, show_button:false
 
-%table.table
-  %tbody
-    %tr{:class=>@ticket.ticket_type.tr_class}
-      %td{style:'width:100px'}  
 
-      %td
-
-        - unless @ticket.open?
+- unless @ticket.open?
+  %table.table
+    %tbody
+      %tr{:class=>@ticket.ticket_type.tr_class}
+        %td{style:'width:100px'}
+        %td
           = t('helpdesk.tickets.ticket_closed')
-        -else
+- if @ticket.open? || helpdesk_user == @ticket.requester
+  %table.table
+    %tbody
+      %tr{:class=>@ticket.ticket_type.tr_class}
+        %td{style:'width:100px'}
+        %td
           = simple_form_for(@ticket, :html => {:class => 'form-vertical' }) do |f|
             - if @ticket.errors.any?
               %div.error_explanation
@@ -28,7 +32,7 @@
                 / , :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'mini'},:language => I18n.locale}
 
                 = tickets_form.input :public, :input_html => {:value=>1},:as=>:hidden
-                = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id } 
+                = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id }
             %div
               = f.button :submit, :class => 'btn-primary'
-              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"    
+              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"

data/lib/generators/helpdesk/templates/README

@@ -17,7 +17,12 @@ You need to do some manual setup to get Helpdesk working:
 
 4.  Add a helpdesk_user method to your applications application_controller.rb
     that exposes your current_user
-  
+
+    Example, for devise gem:
+    def helpdesk_user
+      current_user
+    end
+
 5.
 
 ===============================================================================

data/lib/generators/helpdesk/templates/helpdesk.rb

@@ -1,15 +1,21 @@
 require 'helpdesk'
 
 ::Helpdesk.setup do |config|
-  # Class that represents the user 
+  # Class that represents the user
   config.user_class = "User"
 
+  # Method usign to display information about user for users
+  config.display_user = "name"
+
+  # Method usign to display information about user for admins (name+id?)
+  config.display_user_uniq_info = "name"
+
   # Require User to be present in order to access Helpdesk
   config.require_user = true
-  
+
   # Base application sign in route name
-  config.sign_in_url = 'sign_in_url' 
-  
+  config.sign_in_url = 'sign_in_url'
+
   # Ticket issue types
   config.issue_types = ['bug', 'change request', 'new feature']
 

data/lib/helpdesk.rb

@@ -10,8 +10,10 @@ module Helpdesk
 
   mattr_accessor :display_user
 
+  mattr_accessor :display_user_uniq_info
+
   mattr_accessor :issue_types
-  
+
   mattr_accessor :mail_server
 
   mattr_accessor :email
@@ -23,9 +25,9 @@ module Helpdesk
 
   mattr_accessor :site_address
 
-  mattr_accessor :helpdesk_name  
+  mattr_accessor :helpdesk_name
   @@helpdesk_name = "Helpdesk"
-  
+
   def self.setup
     yield self
   end

data/lib/helpdesk/engine.rb

@@ -2,6 +2,11 @@ require 'rails'
 require 'simple_form'
 require 'state_machine'
 require 'bootstrap-sass'
+require 'rails_autolink'
+require 'simple_form'
+require 'globalize3'
+require 'batch_translations'
+require 'ckeditor'
 
 module Helpdesk
   class Engine < ::Rails::Engine

data/lib/helpdesk/version.rb

@@ -1,3 +1,3 @@
 module Helpdesk
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helpdesk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - John Beynon Wacław Łuczak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -136,6 +136,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails_autolink
+  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'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement