helpdesk 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7c264b1d4f7d74f09eaeb46e1654052b1572d2e
-  data.tar.gz: 19894c8b1ab76fb70efb83b70c1f561c1ec00b28
+  metadata.gz: 70a9850e2834db223aeafc7470b0f47f1fceb886
+  data.tar.gz: 967935c0fca95a8f4466a66e95fb73b15c6c2a0d
 SHA512:
-  metadata.gz: e96da624d0673c09ca321bf67cc82c431e406a2c66ced324ef60f512c4ee5909269d95368e1d7c0b4d822a870418e12357002244c7a1c9336ad8efbe0de21e41
-  data.tar.gz: 58d8aca728fc2890ac71c618d725f46378503a227c19a9ddfc18975e8f5b12f055a47ad228693bc95aa063d94bf4392ead607fc7eafd99d5cba81b17fd21a18a
+  metadata.gz: 296fce427ebe697647dcc4deec33d181df97b4b81153571f74474bbcfde1e12edf2ab3c4993ec56d0b5c633ed519b137609f116d85026a7fadc4f97279416f42
+  data.tar.gz: 344ac0b84642ad24a68d0d3914ec339e76ac1adda274c8bc53a3a7b055a3de731147a415c79044a5ca8a7af1dd16ff66dcc01daf76583bdbe5b4561f20464387

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

@@ -70,7 +70,7 @@ class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
    private
 
     def ticket_params
-      params.require(:ticket).permit(:status, :assignee_id,:ticket_type_id, :subject, :description,comments_attributes:[:author_id, :comment, :public])
+      params.require(:ticket).permit(:status,:requester_id,:assignee_id,:ticket_type_id, :subject, :description,comments_attributes:[:author_id, :comment, :public])
     end
 
 end

data/app/models/helpdesk/comment.rb

@@ -4,7 +4,7 @@ module Helpdesk
     belongs_to :ticket
 
     default_scope -> {includes(:author).order('id ASC')}
-    scope :pub,  -> { where(:public, true)}
+    scope :pub,  -> { where(public: true)}
 
     after_create :send_email
     after_create :check_reopen

data/app/models/helpdesk/faq.rb

@@ -5,7 +5,7 @@ module Helpdesk
 
     default_scope order('position ASC').includes(:translations)
 
-    scope :active, where('active  = ? ', true)
-    scope :inactive, where('active  = ? ', false)
+    scope :active,  -> {where(active:  true)}
+    scope :inactive,  -> {where(active: false)}
   end
 end

data/app/models/helpdesk/ticket.rb

@@ -31,7 +31,7 @@ module Helpdesk
     .includes(:ticket_type)
     .order('id DESC')}
 
-    validates_presence_of :description,:requester_id,:ticket_type_id
+    validates_presence_of :description,:requester,:ticket_type_id
 
     accepts_nested_attributes_for :comments,:reject_if => lambda { |a| a[:comment].blank? }
 

data/app/models/helpdesk/ticket_type.rb

@@ -5,8 +5,8 @@ module Helpdesk
 
     default_scope ->{order('position ASC')}
 
-    scope :active,  -> {where(:active,  true)}
-    scope :inactive,  -> {where(:active, false)}
+    scope :active,  -> {where(active:  true)}
+    scope :inactive,  -> {where(active: false)}
 
   end
 end

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

@@ -7,10 +7,10 @@
         - @ticket.errors.full_messages.each do |msg|
           %li
             = msg
-  = f.input :requester_id, :collection => (Helpdesk.user_class).all,:label_method=>Helpdesk.display_user_uniq_info.to_sym, input_html: { class: 'chosen-select' }
+  = f.association :requester, :collection => (Helpdesk.user_class).all,:label_method=>Helpdesk.display_user_uniq_info.to_sym, input_html: { class: 'chosen-select' }
   = f.input :subject
   = f.input :status, :collection => tickets_statuses_for_select, include_blank: false
-  = f.input :assignee_id, :collection => helpdesk_admin_collection
+  = f.input :assignee, :collection => helpdesk_admin_collection
   = f.input :ticket_type_id, :collection => Helpdesk::TicketType.active,include_blank: false
   - if @ticket.new_record?
     = f.input :description,input_html:{rows:4}
@@ -20,4 +20,4 @@
 
   %div.form-actions
     = f.button :submit, :class => 'btn btn-primary'
-    = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"
+    = submit_tag t('helpdesk..tickets.cancel'), :type => :reset, :class => "btn btn-danger"

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

@@ -33,4 +33,4 @@
                 = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id }
             %div.form-actions
               = f.button :submit, :class => 'btn btn-primary'
-              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-danger"
+              = submit_tag t('helpdesk..tickets.cancel'), :type => :reset, :class => "btn btn-danger"

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

@@ -35,4 +35,4 @@
                 = tickets_form.input :author_id, :as => :hidden, :input_html => { :value => helpdesk_user.id }
             %div
               = f.button :submit, :class => 'btn btn-primary'
-              = submit_tag 'Anuluj', :type => :reset, :class => "btn btn-default"
+              = submit_tag t('helpdesk..tickets.cancel'), :type => :reset, :class => "btn btn-default"

data/config/locales/helpdesk.en.yml

@@ -47,7 +47,7 @@ en:
 
     subscribers:
       title: Subscribers
-      confirmed: Confirmed subskrybenci
+      confirmed: Confirmed Subscribers
       unconfirmed: Unconfirmed
       all: All Subscribers
       new: Add Subscriber

data/lib/helpdesk/version.rb

@@ -1,3 +1,3 @@
 module Helpdesk
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helpdesk
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - John Beynon Wacław Łuczak