helpdesk 0.0.14 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e94a6de04562f6bca0ed76c04992ad1b1103f3b9
-  data.tar.gz: bb708658e68b3826ef85a0f4e7907d4c5ff197e6
+  metadata.gz: 3c06e151a2b309e2e7638027643791b305bea162
+  data.tar.gz: 64749502ac0b65a9084953eb41c527f0bc1799e5
 SHA512:
-  metadata.gz: f477d1e08a738315940da0a43b82da6d0bdb065b44d3e2b25f9a35cbff1da17093a825c18d3e8b1c9f5d637311474e2a10219044896b348d857487bb461b93c2
-  data.tar.gz: 0dbc29b8a24e193f53ed6db944444d60940f3309a841d8e868b540318bb80a21b395d469c585190bad6cf5c7595fc4d39e6e293fb90e146b876bc0bd458d9f95
+  metadata.gz: 1619c60b75d9f06027bc8bf47db24e1c7490dfc9e6fe6ee33ec8bd8c0e4e2ee43be875beb8a19cef1aca360b162de2032befcd5df289c25669bac681c4819f28
+  data.tar.gz: 29b82d23b895834502a5f524564e684a768082c98f1ebab815dd21aebef852a6659eed0f5d7a4fcf527153fd214158985c9e1d522ea17fa4910f3fbae9a171e8

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

@@ -14,7 +14,7 @@ module Helpdesk
 
         def authenticate_helpdesk_admin
           unless helpdesk_admin?
-            redirect_to main_app.root_url
+            redirect_to main_app.root_url, notice:'You have no power here!'
           end
         end
 

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

@@ -52,7 +52,7 @@ class Helpdesk::Admin::FaqsController < Helpdesk::Admin::BaseController
   # POST /faqs
   # POST /faqs.json
   def create
-    @faq = Helpdesk::Faq.new(params[:faq])
+    @faq = Helpdesk::Faq.new(faq_params)
 
     respond_to do |format|
       if @faq.save
@@ -71,7 +71,7 @@ class Helpdesk::Admin::FaqsController < Helpdesk::Admin::BaseController
     @faq = Helpdesk::Faq.find(params[:id])
 
     respond_to do |format|
-      if @faq.update_attributes(params[:faq])
+      if @faq.update_attributes(faq_params)
         format.html { redirect_to admin_faqs_url, notice: 'Faq was successfully updated.' }
         format.json { head :no_content }
       else
@@ -92,4 +92,9 @@ class Helpdesk::Admin::FaqsController < Helpdesk::Admin::BaseController
       format.json { head :no_content }
     end
   end
+
+  private
+  def faq_params
+    params.require(:faq).permit(:active, :position, :title, :text, translations_attributes:[:id,:locale,:title,:text])
+  end
 end

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

@@ -9,7 +9,7 @@ class Helpdesk::Admin::SubscribersController < Helpdesk::Admin::BaseController
   end
 
   def create
-    @subscriber = Helpdesk::Subscriber.new(params[:subscriber])
+    @subscriber = Helpdesk::Subscriber.new(subscriber_params)
     if @subscriber.save
       redirect_to admin_subscribers_path, notice: t('subscribers.created')
     else
@@ -26,7 +26,7 @@ class Helpdesk::Admin::SubscribersController < Helpdesk::Admin::BaseController
   def update
     @subscriber = Helpdesk::Subscriber.find(params[:id])
 
-    if @subscriber.update_attributes(params[:subscriber])
+    if @subscriber.update_attributes(subscriber_params)
       redirect_to admin_subscribers_path, notice: 'Subscriber was successfully updated.'
     else
       render action: "edit"
@@ -40,4 +40,10 @@ class Helpdesk::Admin::SubscribersController < Helpdesk::Admin::BaseController
     @subscriber.destroy
     redirect_to root_path
   end
+
+  private
+
+  def subscriber_params
+    params.require(:subscriber).permit(:confirmed, :email, :hashcode, :lang, :name)
+  end
 end

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

@@ -17,7 +17,7 @@ class Helpdesk::Admin::TicketTypesController < Helpdesk::Admin::BaseController
   end
 
   def create
-    @ticket_type = Helpdesk::TicketType.new(params[:ticket_type])
+    @ticket_type = Helpdesk::TicketType.new(ticket_type_params)
     if @ticket_type.save
       redirect_to admin_ticket_types_url, notice: 'Ticket type was successfully created.'
     else
@@ -27,7 +27,7 @@ class Helpdesk::Admin::TicketTypesController < Helpdesk::Admin::BaseController
 
   def update
     @ticket_type = Helpdesk::TicketType.find(params[:id])
-    if @ticket_type.update_attributes(params[:ticket_type])
+    if @ticket_type.update_attributes(ticket_type_params)
       redirect_to admin_ticket_types_url, notice: 'Ticket type was successfully updated.'
     else
       render action: "edit"
@@ -43,4 +43,10 @@ class Helpdesk::Admin::TicketTypesController < Helpdesk::Admin::BaseController
       format.json { head :no_content }
     end
   end
-end
+
+  private
+
+  def ticket_type_params
+    params.require(:ticket_type).permit(:active,:position,:title,:tr_class. translations_attributes:[:title])
+  end
+end

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

@@ -10,7 +10,7 @@ class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
     elsif params[:tickets] == 'all'
       @tickets = Helpdesk::Ticket.scoped
     else
-      @tickets = my_tickets.active.scoped
+      @tickets = my_tickets.active
     end
     @tickets = @tickets.includes(:requester)
                         .includes(:assignee)
@@ -46,7 +46,7 @@ class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
   end
 
   def create
-    @ticket = Helpdesk::Ticket.new(params[:ticket])
+    @ticket = Helpdesk::Ticket.new(ticket_params)
     if @ticket.save
       redirect_to admin_ticket_path(@ticket)
     else
@@ -56,7 +56,7 @@ class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
 
   def update
     @ticket = Helpdesk::Ticket.find(params[:id])
-    if @ticket.update_attributes(params[:ticket])
+    if @ticket.update_attributes(ticket_params)
       unless @ticket.assignee
         @ticket.update_column(:assignee_id, helpdesk_user)
       end
@@ -66,4 +66,11 @@ class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
     end
   end
 
+
+   private
+
+    def ticket_params
+      params.require(:ticket).permit(:status, :assignee_id,:ticket_type_id, :subject, :description,comments_attributes:[:author_id, :comment, :public])
+    end
+
 end

data/app/controllers/helpdesk/application_controller.rb

@@ -1,15 +1,13 @@
 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'
 
     def ensure_user
-      if !helpdesk_user
+      unless helpdesk_user
         redirect_to main_app.send(Helpdesk.sign_in_url)
       end
     end
@@ -18,12 +16,5 @@ module Helpdesk
       { :locale => I18n.locale}
     end
 
-    # def helpdesk_admin?
-    #   helpdesk_user && (can? :manage, 'helpdesk')
-    # end
-    # helper_method :helpdesk_admin?
-
-
-
   end
 end

data/app/controllers/helpdesk/dashboard_controller.rb

@@ -13,7 +13,7 @@ module Helpdesk
 
 
     def my_tickets
-      @my_tickets = Ticket
+      @my_tickets = Helpdesk::Ticket
       .includes(:comments=>[:author])
       .includes(:requester)
       .includes(:assignee)

data/app/controllers/helpdesk/subscribers_controller.rb

@@ -1,29 +1,7 @@
 module Helpdesk
   class SubscribersController < Helpdesk::ApplicationController
-    # GET /subscribers
-    # GET /subscribers.json
-    def index
-      @subscribers = Subscriber.all
 
-      respond_to do |format|
-        format.html # index.html.erb
-        format.json { render json: @subscribers }
-      end
-    end
-
-    # GET /subscribers/1
-    # GET /subscribers/1.json
-    def show
-      @subscriber = Subscriber.find(params[:id])
-
-      respond_to do |format|
-        format.html # show.html.erb
-        format.json { render json: @subscriber }
-      end
-    end
 
-    # GET /subscribers/new
-    # GET /subscribers/new.json
     def new
       @subscriber = Subscriber.new
 
@@ -33,15 +11,8 @@ module Helpdesk
       end
     end
 
-    # GET /subscribers/1/edit
-    def edit
-      @subscriber = Subscriber.find(params[:id])
-    end
-
-    # POST /subscribers
-    # POST /subscribers.json
     def create
-      @subscriber = Subscriber.new(params[:subscriber])
+      @subscriber = Subscriber.new(subscriber_params)
 
       respond_to do |format|
         if @subscriber.save
@@ -60,7 +31,7 @@ module Helpdesk
       @subscriber = Subscriber.find(params[:id])
 
       respond_to do |format|
-        if @subscriber.update_attributes(params[:subscriber])
+        if @subscriber.update_attributes(subscriber_params)
           format.html { redirect_to @subscriber, notice: 'Subscriber was successfully updated.' }
           format.json { head :no_content }
         else
@@ -81,5 +52,11 @@ module Helpdesk
         format.json { head :no_content }
       end
     end
+
+    private
+
+    def subscriber_params
+      params.require(:subscriber).permit(:email,:lang, :name)
+    end
   end
 end

data/app/controllers/helpdesk/tickets_controller.rb

@@ -1,5 +1,8 @@
 module Helpdesk
   class TicketsController < Helpdesk::ApplicationController
+
+    helper TicketsHelper
+
     # GET /tickets
     # GET /tickets.json
     def index
@@ -43,15 +46,8 @@ module Helpdesk
       end
     end
 
-    # GET /tickets/1/edit
-    def edit
-      @ticket = Helpdesk::Ticket.find(params[:id])
-    end
-
-    # POST /tickets
-    # POST /tickets.json
     def create
-      @ticket = Helpdesk::Ticket.new(params[:ticket])
+      @ticket = Helpdesk::Ticket.new(ticket_params)
       @ticket.requester = helpdesk_user
       @ticket.status = Helpdesk::Ticket::STATUSES[0][0]
 
@@ -72,7 +68,9 @@ module Helpdesk
       @ticket = Helpdesk::Ticket.find(params[:id])
 
       respond_to do |format|
-        if @ticket.update_attributes(params[:ticket])
+        if @ticket.update_attributes(ticket_params)
+          puts ticket_params
+          puts paramsp
           format.html { redirect_to @ticket, notice: 'Ticket was successfully updated.' }
           format.json { head :no_content }
         else
@@ -82,5 +80,12 @@ module Helpdesk
       end
     end
 
+
+    private
+
+    def ticket_params
+      params.require(:ticket).permit( :ticket_type_id, :subject, :description,comments_attributes:[:author_id, :comment, :public])
+    end
+
   end
 end

data/app/helpers/helpdesk/admin/tickets_helper.rb

@@ -1,4 +1,13 @@
 module Helpdesk
   module Admin::TicketsHelper
+    def humanize_with_i18n(string, scope = [])
+      I18n.t string, scope: scope, default: string.humanize
+    end
+
+    # The method prefix tells me that this should be in an object
+    # But it doesn't belong in our model, does it?
+    def tickets_statuses_for_select
+      Helpdesk::Ticket::STATUSES.map { |s| [humanize_with_i18n(s[0].to_s,'helpdesk.tickets.statuses'),s[0]] }
+    end
   end
 end

data/app/helpers/helpdesk/tickets_helper.rb

@@ -1,4 +1,7 @@
 module Helpdesk
   module TicketsHelper
+
+
+
   end
 end

data/app/mailers/helpdesk/notifications_mailer.rb

@@ -1,5 +1,7 @@
 class Helpdesk::NotificationsMailer < ActionMailer::Base
 
+  layout 'mailer_layout'
+
   def ticket_created_notification(ticket)
     @ticket = ticket
     mail(:subject=>"#{Helpdesk.helpdesk_name} | #{ticket.subject}",
@@ -12,7 +14,6 @@ class Helpdesk::NotificationsMailer < ActionMailer::Base
          :to => ticket.requester.email)
   end
 
-
   def comment_by_requester_notification(comment)
     @comment = comment
     mail(:subject=>"#{Helpdesk.helpdesk_name} | #{comment.ticket.subject}",

data/app/models/helpdesk/comment.rb

@@ -1,11 +1,10 @@
 module Helpdesk
   class Comment < ActiveRecord::Base
-    attr_accessible :author_id, :comment, :public, :ticket_id
     belongs_to :author, :class_name => Helpdesk.user_class.to_s
     belongs_to :ticket
 
-    default_scope includes(:author).order('id ASC')
-    scope :pub,  where('public = ?',true)
+    default_scope -> {includes(:author).order('id ASC')}
+    scope :pub,  -> { where(:public, true)}
 
     after_create :send_email
     after_create :check_reopen

data/app/models/helpdesk/faq.rb

@@ -2,7 +2,7 @@ module Helpdesk
   class Faq < ActiveRecord::Base
     translates :title, :text
     accepts_nested_attributes_for :translations
-    attr_accessible :active, :position, :text, :title,:translations_attributes
+    #attr_accessible :active, :position, :text, :title,:translations_attributes
 
     default_scope order('position ASC').includes(:translations)
 

data/app/models/helpdesk/ticket.rb

@@ -2,41 +2,34 @@ module Helpdesk
   class Ticket < ActiveRecord::Base
 
     STATUSES = [
-      [ :new,        'Nowe:', 'label-important',3],
-      [ :open,        'Otwarte:', 'label-warning',2],
-      [ :waiting,     'Otwarte: oczekujące', 'label-info',2],
-      [ :solved,      'Zamknięte: problem rozwiązany','label-success',0],
-      [ :not_fixable, 'Zamknięte: nienaprawialne','label-inverse',-1],
-      [ :unreachable, 'Zamknięte: klient nieosiągalny','label-inverse',-1],
-      [ :bug,         'Zamknięte: Przeniesione do bug tracker\'a','label-inverse',-1]
+      [ :new,        'label-primary',3],
+      [ :open,        'label-warning',2],
+      [ :waiting,     'label-info',2],
+      [ :solved,      'label-success',0],
+      [ :not_fixable, 'label-default',-1],
+      [ :unreachable, 'label-default',-1],
+      [ :bug,         'label-default',-1]
     ]
-    STATUS_OPTIONS = STATUSES.map { |i| [i[1], i[0]] }
     STATUS_BY_KEY = Hash[*STATUSES.map { |i| [i[0], i[1]] }.flatten]
-    STATUS_CLASS_BY_KEY= Hash[*STATUSES.map { |i| [i[0], i[2]] }.flatten]
-    STATUS_STATUS_BY_KEY= Hash[*STATUSES.map { |i| [i[0], i[3]] }.flatten]
-    OPEN_STATUSES_KEYS =  STATUSES.map { |i| (i[3]>0 ? i[0] : nil)}.compact
-
-    attr_accessible :subject, :description
-    attr_accessible :requester_id, :assignee_id, :status, :comments_attributes,:ticket_type_id
-
-
+    STATUS_CLASS_BY_KEY= Hash[*STATUSES.map { |i| [i[0], i[1]] }.flatten]
+    STATUS_STATUS_BY_KEY= Hash[*STATUSES.map { |i| [i[0], i[2]] }.flatten]
+    OPEN_STATUSES_KEYS =  STATUSES.map { |i| (i[2]>0 ? i[0] : nil)}.compact
 
 
     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",:dependent => :destroy
-
+    has_many :comments, -> {order("created_at DESC")},:dependent => :destroy
 
 
-    scope :active,  where('status IN (?) ',OPEN_STATUSES_KEYS)
-    scope :unassigned,  where('status IN (?) ',OPEN_STATUSES_KEYS).where('assignee_id is null')
-    scope :closed, where('status NOT IN (?)',OPEN_STATUSES_KEYS)
-    default_scope includes(:comments=>[:author])
+    scope :active,   -> {where('status IN (?) ',OPEN_STATUSES_KEYS)}
+    scope :unassigned,   -> {where('status IN (?) ',OPEN_STATUSES_KEYS).where('assignee_id is null')}
+    scope :closed, -> { where('status NOT IN (?)',OPEN_STATUSES_KEYS)}
+    default_scope -> { includes(:comments=>[:author])
     .includes(:requester)
     .includes(:assignee)
     .includes(:ticket_type)
-    .order('id DESC')
+    .order('id DESC')}
 
     validates_presence_of :description,:requester_id,:ticket_type_id
 
@@ -85,5 +78,8 @@ module Helpdesk
       end
     end
 
+
+
+
   end
 end

data/app/models/helpdesk/ticket_type.rb

@@ -2,12 +2,12 @@ module Helpdesk
   class TicketType < ActiveRecord::Base
     translates :title
     accepts_nested_attributes_for :translations
-    attr_accessible :active, :position,:title,:translations_attributes,:tr_class
+    #attr_accessible :active, :position,:title,:translations_attributes,:tr_class
 
-    default_scope order('position ASC')
+    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