helpdesk 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5786302c9e0232c2c4b770927f76cfb79cae7cb2
-  data.tar.gz: acb47b5946c3c45bba8775e89775fd05c780b0f8
+  metadata.gz: a31fb0b8d00ad49071082b158b4b60831cda1b7d
+  data.tar.gz: 21fd5fd39176a65e7e8fc0d36e4ffdb60feaac30
 SHA512:
-  metadata.gz: b6f9ed3e548a2c5f8268a3dc5e69585c5f1bd0cbb6a2ca7e259bb32e943299e4f192669db22deb6c17900a336eb26e28f07312ba75b531cc58eca64476cac68a
-  data.tar.gz: 551e4aba11cf1fcce476e0e4feec24392ee4c3ac8b48d4f1083af1f4e5a5bbe68fdd305348cc336396562e7f6311f514a58dc50d9d531626fc7ed5c001906e9c
+  metadata.gz: 3835a5b84681a7d485a592f12b3815c0a224c485bae239e58b2192e805bdb16ddb2b2d2e9d74cc9913454b6576fe239bc9675020a29e0652ac47b35838f3ad70
+  data.tar.gz: 55fc013767346701c35c4dd11bc992ff546aed55fc61a3d1dcceb6539f23b23ed74729fee8566ca9fb792d3372dc6c642f3b43e7c496e91072ab33e83f5e5fe2

data/app/assets/javascripts/helpdesk/admin/tickets.js

@@ -5,16 +5,4 @@ $(document).ready(function(){
     $('a[href*="#"]').click(function(){
         $($(this).attr("href")).effect("highlight", {}, 1500);
     });
-});
-
-(function() {
-  $(function() {
-    return $('.chosen-select').chosen({
-      allow_single_deselect: true,
-      placeholder_text: 'Wybierz',
-      no_results_text: 'Nie znaleziono pasujących',
-      width: '220px'
-    });
-  });
-
-}).call(this)
+});

data/app/assets/javascripts/helpdesk/application.js

@@ -15,5 +15,4 @@
 //= require bootstrap
 //= require ckeditor/init
 //= require jquery.ui.all
-//= require chosen-jquery
 //= require_tree .

data/app/assets/stylesheets/helpdesk/admin.css

@@ -3,6 +3,4 @@
  *= require helpdesk/imports
  *= require helpdesk/admin/bootstrap_overrides
  *= require helpdesk/admin/tickets
- *= require bootstrap
- *= require chosen
 */

data/app/assets/stylesheets/helpdesk/imports.css.scss

@@ -0,0 +1,34 @@
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+
+@import "bootstrap/scaffolding";
+@import "bootstrap/grid";
+@import "bootstrap/layouts";
+@import "bootstrap/type";
+@import "bootstrap/code";
+@import "bootstrap/forms";
+@import "bootstrap/tables";
+@import "bootstrap/sprites";
+@import "bootstrap/dropdowns";
+@import "bootstrap/wells";
+@import "bootstrap/component-animations";
+@import "bootstrap/close";
+@import "bootstrap/buttons";
+@import "bootstrap/button-groups";
+@import "bootstrap/alerts";
+@import "bootstrap/navs";
+@import "bootstrap/navbar";
+@import "bootstrap/breadcrumbs";
+@import "bootstrap/pagination";
+@import "bootstrap/pager";
+@import "bootstrap/modals";
+@import "bootstrap/tooltip";
+@import "bootstrap/popovers";
+@import "bootstrap/thumbnails";
+@import "bootstrap/labels-badges";
+@import "bootstrap/progress-bars";
+@import "bootstrap/accordion";
+@import "bootstrap/carousel";
+@import "bootstrap/hero-unit";
+@import "bootstrap/utilities";
+

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

@@ -1,6 +1,6 @@
 module Helpdesk
   module Admin
-    class BaseController < Helpdesk::ApplicationController
+    class BaseController < ::ApplicationController
 
       helper Helpdesk::Engine.helpers
       # helper Helpdesk::ApplicationHelper
@@ -14,7 +14,7 @@ module Helpdesk
 
         def authenticate_helpdesk_admin
           unless helpdesk_admin?
-            redirect_to main_app.root_url, notice:'You have no power here!'
+            redirect_to main_app.root_url
           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(faq_params)
+    @faq = Helpdesk::Faq.new(params[:faq])
 
     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(faq_params)
+      if @faq.update_attributes(params[:faq])
         format.html { redirect_to admin_faqs_url, notice: 'Faq was successfully updated.' }
         format.json { head :no_content }
       else
@@ -92,9 +92,4 @@ 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(subscriber_params)
+    @subscriber = Helpdesk::Subscriber.new(params[:subscriber])
     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(subscriber_params)
+    if @subscriber.update_attributes(params[:subscriber])
       redirect_to admin_subscribers_path, notice: 'Subscriber was successfully updated.'
     else
       render action: "edit"
@@ -40,10 +40,4 @@ 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(ticket_type_params)
+    @ticket_type = Helpdesk::TicketType.new(params[:ticket_type])
     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(ticket_type_params)
+    if @ticket_type.update_attributes(params[:ticket_type])
       redirect_to admin_ticket_types_url, notice: 'Ticket type was successfully updated.'
     else
       render action: "edit"
@@ -43,10 +43,4 @@ class Helpdesk::Admin::TicketTypesController < Helpdesk::Admin::BaseController
       format.json { head :no_content }
     end
   end
-
-  private
-
-  def ticket_type_params
-    params.require(:ticket_type).permit(:active,:position,:title,:tr_class. translations_attributes:[:title])
-  end
-end
+end

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

@@ -2,21 +2,16 @@ class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
 
   def index
     if params[:tickets] == 'unassigned'
-      @tickets = Helpdesk::Ticket.unassigned.scoped
+      @tickets = Helpdesk::Ticket.unassigned
     elsif params[:tickets] == 'closed'
-      @tickets = Helpdesk::Ticket.closed.scoped
+      @tickets = Helpdesk::Ticket.closed
     elsif params[:tickets] == 'active'
-      @tickets = Helpdesk::Ticket.active.scoped
+      @tickets = Helpdesk::Ticket.active
     elsif params[:tickets] == 'all'
-      @tickets = Helpdesk::Ticket.scoped
+      @tickets = Helpdesk::Ticket.all
     else
       @tickets = my_tickets.active
     end
-    @tickets = @tickets.includes(:requester)
-                        .includes(:assignee)
-                        .includes(:ticket_type)
-                        .page(params[:page])
-
     render 'list'
   end
 
@@ -37,18 +32,18 @@ class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
 
   def edit
     @ticket = Helpdesk::Ticket.find(params[:id])
-
+    
   end
 
   def show
     @ticket = Helpdesk::Ticket.find(params[:id])
-
+    
   end
 
   def create
-    @ticket = Helpdesk::Ticket.new(ticket_params)
+    @ticket = Helpdesk::Ticket.new(params[:ticket])
     if @ticket.save
-      redirect_to admin_ticket_path(@ticket)
+      redirect_to admin_ticket_path
     else
       render action: "new"
     end
@@ -56,7 +51,7 @@ class Helpdesk::Admin::TicketsController < Helpdesk::Admin::BaseController
 
   def update
     @ticket = Helpdesk::Ticket.find(params[:id])
-    if @ticket.update_attributes(ticket_params)
+    if @ticket.update_attributes(params[:ticket])
       unless @ticket.assignee
         @ticket.update_column(:assignee_id, helpdesk_user)
       end
@@ -66,11 +61,4 @@ 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,20 +1,25 @@
 module Helpdesk
   class ApplicationController < ::ApplicationController
     before_filter :ensure_user, :if => Proc.new { Helpdesk.require_user }
-
+    
     helper Helpdesk::Engine.helpers
+    
+
 
     layout 'helpdesk/user'
 
     def ensure_user
-      unless helpdesk_user
+      if !helpdesk_user
         redirect_to main_app.send(Helpdesk.sign_in_url)
       end
     end
 
-    def default_url_options(options={})
-      { :locale => I18n.locale}
+    def helpdesk_admin?
+      helpdesk_user && (can? :manage, 'helpdesk')
     end
+    helper_method :helpdesk_admin?
+    
+
 
   end
 end

data/app/controllers/helpdesk/dashboard_controller.rb

@@ -1,5 +1,5 @@
 module Helpdesk
-  class DashboardController < Helpdesk::ApplicationController
+  class DashboardController < ApplicationController
 
 
     before_filter :my_tickets
@@ -13,7 +13,7 @@ module Helpdesk
 
 
     def my_tickets
-      @my_tickets = Helpdesk::Ticket
+      @my_tickets = Ticket
       .includes(:comments=>[:author])
       .includes(:requester)
       .includes(:assignee)

data/app/controllers/helpdesk/faqs_controller.rb

@@ -1,7 +1,85 @@
 module Helpdesk
-  class FaqsController < Helpdesk::ApplicationController
+  class FaqsController < ApplicationController
+    # GET /faqs
+    # GET /faqs.json
     def index
-      @faqs = Helpdesk::Faq.active
+      @faqs = Faq.all
+  
+      respond_to do |format|
+        format.html # index.html.erb
+        format.json { render json: @faqs }
+      end
+    end
+  
+    # GET /faqs/1
+    # GET /faqs/1.json
+    def show
+      @faq = Faq.find(params[:id])
+  
+      respond_to do |format|
+        format.html # show.html.erb
+        format.json { render json: @faq }
+      end
+    end
+  
+    # GET /faqs/new
+    # GET /faqs/new.json
+    def new
+      @faq = Faq.new
+  
+      respond_to do |format|
+        format.html # new.html.erb
+        format.json { render json: @faq }
+      end
+    end
+  
+    # GET /faqs/1/edit
+    def edit
+      @faq = Faq.find(params[:id])
+    end
+  
+    # POST /faqs
+    # POST /faqs.json
+    def create
+      @faq = Faq.new(params[:faq])
+  
+      respond_to do |format|
+        if @faq.save
+          format.html { redirect_to @faq, notice: 'Faq was successfully created.' }
+          format.json { render json: @faq, status: :created, location: @faq }
+        else
+          format.html { render action: "new" }
+          format.json { render json: @faq.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+  
+    # PUT /faqs/1
+    # PUT /faqs/1.json
+    def update
+      @faq = Faq.find(params[:id])
+  
+      respond_to do |format|
+        if @faq.update_attributes(params[:faq])
+          format.html { redirect_to @faq, notice: 'Faq was successfully updated.' }
+          format.json { head :no_content }
+        else
+          format.html { render action: "edit" }
+          format.json { render json: @faq.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+  
+    # DELETE /faqs/1
+    # DELETE /faqs/1.json
+    def destroy
+      @faq = Faq.find(params[:id])
+      @faq.destroy
+  
+      respond_to do |format|
+        format.html { redirect_to faqs_url }
+        format.json { head :no_content }
+      end
     end
   end
 end

data/app/controllers/helpdesk/subscribers_controller.rb

@@ -1,19 +1,48 @@
 module Helpdesk
-  class SubscribersController < Helpdesk::ApplicationController
-
-
+  class SubscribersController < 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
-
+  
       respond_to do |format|
         format.html # new.html.erb
         format.json { render json: @subscriber }
       end
     end
-
+  
+    # GET /subscribers/1/edit
+    def edit
+      @subscriber = Subscriber.find(params[:id])
+    end
+  
+    # POST /subscribers
+    # POST /subscribers.json
     def create
-      @subscriber = Subscriber.new(subscriber_params)
-
+      @subscriber = Subscriber.new(params[:subscriber])
+  
       respond_to do |format|
         if @subscriber.save
           format.html { redirect_to @subscriber, notice: 'Subscriber was successfully created.' }
@@ -24,14 +53,14 @@ module Helpdesk
         end
       end
     end
-
+  
     # PUT /subscribers/1
     # PUT /subscribers/1.json
     def update
       @subscriber = Subscriber.find(params[:id])
-
+  
       respond_to do |format|
-        if @subscriber.update_attributes(subscriber_params)
+        if @subscriber.update_attributes(params[:subscriber])
           format.html { redirect_to @subscriber, notice: 'Subscriber was successfully updated.' }
           format.json { head :no_content }
         else
@@ -40,23 +69,17 @@ module Helpdesk
         end
       end
     end
-
+  
     # DELETE /subscribers/1
     # DELETE /subscribers/1.json
     def destroy
       @subscriber = Subscriber.find(params[:id])
       @subscriber.destroy
-
+  
       respond_to do |format|
         format.html { redirect_to subscribers_url }
         format.json { head :no_content }
       end
     end
-
-    private
-
-    def subscriber_params
-      params.require(:subscriber).permit(:email,:lang, :name)
-    end
   end
 end