radesk 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc951107bd076dc1fa44b4c559672d1d8f368fff
-  data.tar.gz: 8dbf8b5bd494980eed407be55f7f836d66989136
+  metadata.gz: b2ed092bc42cc7e458336c1c4e0a11904dd13474
+  data.tar.gz: aa72ca554c26ad3e28e5c2f9eb1ee33959e2c6c4
 SHA512:
-  metadata.gz: 1f5572478e61d09ba31065e1fc8a7356784076d13f763c6a0d20fa5ed6c16eacbbb40522114e3d21bcd96512976a472ed148d8f3f1383e70fd56de29cdd27879
-  data.tar.gz: 21a91363a3e735fddce8cbc3fc50d0dea6d87fd94693f492c0ff3eeeaf65ca2eaf593acb0c9df3c0afc26f8e0489927f3dbedec7542f3a6af84160bf1570896d
+  metadata.gz: 74b0cd8822399fde34cb6f7dbbe22867fd35fb1391ff42d73b78a942387d628a816db73f4fa044283604b3acb57b0e7c0d2672e3634674ff555d212376ce8e33
+  data.tar.gz: c53a78034253365ac4c094d052abd55e6a028c4084e5d7512fbffa63c817bdedbebd3ca138e96d7ee0c34f5c6cb70d0e9475a63522e73aa7965b0a0ad3796515

data/app/assets/javascripts/radesk/radesk.js.coffee

@@ -0,0 +1,4 @@
+$ ->
+  $(".add_fields").click (event) ->
+    $(this).before($(this).data('fields'))
+    event.preventDefault()

data/app/assets/stylesheets/radesk/radesk.css.scss

@@ -11,7 +11,7 @@ $light_color: #f6f6f6;
     }
   }
   a { 
-    color: $dark_color; 
+    color: $dark_color;
     text-decoration: none;
     &:hover {
       color: $main_color;
@@ -28,8 +28,6 @@ $light_color: #f6f6f6;
     margin: 0 auto;
   }
 
-
-
   .notice {
     background: $main_color;
     color: #fff;
@@ -125,34 +123,29 @@ $light_color: #f6f6f6;
 
   .ticket {
     margin-bottom: 40px;
-    .message {
-      font-size: 14px;
-      line-height: 20px;
-    }
-    .info {
-      margin-bottom: 20px;
-      color: darken($light_color, 20%);
-      span {
-        margin-left: 10px;
-      }
-    }
   }
   
   .answers {
     margin-bottom: 40px;
     .answer {
-      padding: 20px 0;
-      border-top: 1px solid darken($light_color, 5%);
-      &.private {
-        background: $light_color;
-        padding: 20px;
+      margin-bottom: 20px;
+      padding-bottom: 20px;
+      border-bottom: 1px solid $light_color;
+      &:last-child {
+        border: none;
       }
       .info {
         margin-bottom: 10px;
         color: darken($light_color, 20%);
+        .private {
+          color: $main_color;
+        }
         span {
           margin-left: 10px;
         }
+        a {
+          color: darken($light_color, 20%);
+        }
       }
       .message {
         font-size: 14px;
@@ -161,6 +154,19 @@ $light_color: #f6f6f6;
     }
   }
 
+  .uploads {
+    padding-top: 20px;
+    .file {
+      margin-bottom: 3px;
+      .fa {
+        margin-right: 3px;
+      }
+      a {
+        color: darken($light_color, 20%);
+      }
+    }
+  }
+
   .btn {
     display: inline-block;
     padding: 8px 13px;
@@ -212,6 +218,22 @@ $light_color: #f6f6f6;
           margin-right: 5px;
         }
       }
+      .beside {
+        display: inline-block;
+        margin-left: 10px;
+      }
+    }
+  }
+
+  .add-something {
+    padding-top: 100px;
+    .title {
+      font-size: 20px;
+      margin-bottom: 5px;
+    }
+    .description {
+      color: darken($light_color, 20%);
+      margin-bottom: 20px;
     }
   }
 }

data/app/controllers/radesk/admin/activities_controller.rb

@@ -0,0 +1,11 @@
+require_dependency "radesk/application_controller"
+
+module Radesk
+  module Admin
+    class ActivitiesController < AdminController      
+      def index
+        @activities = Radesk::Activity.all.order('id DESC').page(params[:page]).per(20)
+      end
+    end
+  end
+end

data/app/controllers/radesk/admin/admin_controller.rb

@@ -0,0 +1,9 @@
+require_dependency "radesk/application_controller"
+
+module Radesk
+  module Admin
+    class AdminController < ApplicationController
+      before_action :radesk_authorize_admin!
+    end
+  end
+end

data/app/controllers/radesk/admin/categories_controller.rb

@@ -2,10 +2,9 @@ require_dependency "radesk/application_controller"
 
 module Radesk
   module Admin
-    class CategoriesController < ApplicationController
+    class CategoriesController < AdminController
       before_action :set_category, only: [:show, :destroy, :edit, :update]
-      before_action :radesk_authorize_admin!
-
+      
       def index
         @categories = Category.all
       end

data/app/controllers/radesk/admin/users_controller.rb

@@ -0,0 +1,18 @@
+require_dependency "radesk/application_controller"
+
+module Radesk
+  module Admin
+    class UsersController < AdminController
+      before_action :set_user, only: [:show]
+
+      def show
+        @tickets = Radesk::Ticket.where(:user_id => @user).page(params[:page]).per(20)
+      end
+
+      private
+        def set_user
+          @user = Radesk.user_class_name.constantize.find(params[:id])
+        end
+    end
+  end
+end

data/app/controllers/radesk/answers_controller.rb

@@ -2,19 +2,20 @@ require_dependency "radesk/application_controller"
 
 module Radesk
   class AnswersController < ApplicationController
-    before_action :set_answer, only: [:edit, :update, :destroy]
-    before_action :check_access, only: [:edit, :update, :destroy]
+    include Radesk::ActivitiesHelper
+    
     before_action :radesk_authorize!
+    before_action :set_answer, only: [:edit, :update, :destroy]
+    before_filter -> { radesk_check_access(@answer) }, only: [:edit, :update, :destroy]
 
     def create
       @answer = Answer.new(answer_params)
-      @answer.user_id = send(Radesk.current_user_method_name).id
+      @answer.user_id = radesk_current_user.id
       @answer.ticket_id = params[:ticket_id]
 
       if @answer.save
-        if @answer.user.id != @answer.ticket.user.id && !@answer.user.radesk_admin?
-          UserMailer.new_answer(@answer.ticket.id).deliver 
-        end
+        UserMailer.new_answer(@answer).deliver_now
+        add_activity(@answer, 'create')
         redirect_to @answer.ticket, notice: 'Answer was successfully created.'
       else
         redirect_to :back, notice: @answer.errors.full_messages.first
@@ -26,6 +27,7 @@ module Radesk
 
     def update
       if @answer.update(answer_params)
+        add_activity(@answer, 'update')
         redirect_to @answer.ticket, notice: 'Answer was successfully updated.'
       else
         render :edit
@@ -42,12 +44,8 @@ module Radesk
         @answer = Answer.find(params[:id])
       end
 
-      def check_access
-        redirect_to :back unless @answer.has_access?(radesk_current_user)
-      end
-
       def answer_params
-        params.require(:answer).permit(:message, :private)
+        params.require(:answer).permit(:message, :private, :uploads_attributes => [:id, :file])
       end
   end
 end

data/app/controllers/radesk/application_controller.rb

@@ -6,11 +6,15 @@ module Radesk
     helper_method :radesk_current_user
 
     def radesk_authorize!
-      redirect_to '/' if !(radesk_current_user)
+      redirect_to Radesk.sign_in_path if !(radesk_current_user)
     end
 
     def radesk_authorize_admin!
       redirect_to root_path if !(radesk_current_user.radesk_admin?)
     end
+
+    def radesk_check_access(object)
+      redirect_to root_path unless object.has_access?(radesk_current_user)
+    end
   end
 end

data/app/controllers/radesk/tickets_controller.rb

@@ -2,13 +2,20 @@ require_dependency "radesk/application_controller"
 
 module Radesk
   class TicketsController < ApplicationController
-    before_action :set_ticket, only: [:show, :edit, :update, :destroy, :open, :close]
-    before_action :check_access, only: [:show, :edit, :update, :destroy]
+    include Radesk::ActivitiesHelper
+    
     before_action :radesk_authorize!
+    before_action :set_ticket, only: [:show, :edit, :update, :destroy, :open, :close]
+    before_action :set_tickets, only: [:index, :category]
+    before_filter -> { radesk_check_access(@ticket) }, only: [:show, :edit, :update, :destroy, :open, :close]
 
     def index
-      @tickets = Ticket.includes(Radesk.user_class_name.downcase.to_sym).all.page(params[:page]).per(20)
-      @tickets = @tickets.where(:user_id => radesk_current_user.id) unless radesk_current_user.try(:radesk_admin?)
+    end
+
+    def category
+      @category = Radesk::Category.find(params[:id])
+      @tickets = @tickets.where(:category_id => @category)
+      render :index
     end
 
     def show
@@ -20,13 +27,16 @@ module Radesk
 
     def new
       @ticket = Ticket.new
+      @ticket.answers.build
     end
 
     def create
       @ticket = Ticket.new(ticket_params)
       @ticket.user_id = send(Radesk.current_user_method_name).id
+      @ticket.answers.first.user = radesk_current_user
 
       if @ticket.save
+        add_activity(@ticket, 'create')
         redirect_to @ticket, notice: 'Ticket was successfully created.'
       else
         render :new
@@ -38,6 +48,7 @@ module Radesk
 
     def update
       if @ticket.update(ticket_params)
+        add_activity(@ticket, 'update')
         redirect_to @ticket, notice: 'Ticket was successfully updated.'
       else
         render :edit
@@ -45,21 +56,19 @@ module Radesk
     end
 
     def destroy
-      if radesk_current_user.try(:radesk_admin?)
-        @ticket.destroy
-        redirect_to tickets_url, notice: 'Ticket was successfully destroyed.'
-      else
-        redirect_to :back
-      end
+      @ticket.destroy
+      redirect_to tickets_url, notice: 'Ticket was successfully destroyed.'
     end
 
     def open
       @ticket.update(:closed => false)
+      add_activity(@ticket, 'open')
       render 'update_status'
     end
 
     def close
       @ticket.update(:closed => true)
+      add_activity(@ticket, 'close')
       render 'update_status'
     end
 
@@ -68,12 +77,13 @@ module Radesk
         @ticket = Ticket.find(params[:id])
       end
 
-      def check_access
-        redirect_to :back unless @ticket.has_access?(radesk_current_user)
+      def set_tickets
+        @tickets = Ticket.includes(Radesk.user_class_name.downcase.to_sym).all.page(params[:page]).per(20)
+        @tickets = @tickets.where(:user_id => radesk_current_user.id) unless radesk_current_user.try(:radesk_admin?)      
       end
 
       def ticket_params
-        params.require(:ticket).permit(:title, :message, :closed, :category_id)
+        params.require(:ticket).permit(:title, :message, :closed, :category_id, :answers_attributes => [:id, :message])
       end
   end
 end

data/app/controllers/radesk/uploads_controller.rb

@@ -0,0 +1,18 @@
+require_dependency "radesk/application_controller"
+
+module Radesk
+  class UploadsController < ApplicationController
+    before_action :radesk_authorize!
+    before_action :set_upload, only: [:destroy]
+    before_filter -> { radesk_check_access(@upload.answer) }, only: [:destroy]
+
+    def destroy
+      @upload.destroy
+    end
+
+    private
+      def set_upload
+        @upload = Radesk::Upload.find(params[:id])
+      end
+  end
+end

data/app/helpers/radesk/activities_helper.rb

@@ -0,0 +1,11 @@
+module Radesk
+  module ActivitiesHelper
+    def add_activity(trackable, action = params[:action])
+      Radesk::Activity.create(:user_id => radesk_current_user, :action => action, :trackable => trackable)
+    end
+
+    def destroy_activities(trackable)
+      Radesk::Activity.where(:trackable_id => trackable.id).destroy_all
+    end
+  end
+end

data/app/helpers/radesk/application_helper.rb

@@ -1,4 +1,13 @@
 module Radesk
   module ApplicationHelper
+    def link_to_add_fields(name = nil, f, association, partial, &block)
+      new_object = f.object.send(association).klass.new
+      fields = f.fields_for association, new_object do |builder|
+        render :partial => "radesk/#{partial}", :locals => { :f => builder }
+      end
+      link_to '#', class: "add_fields", data: { id: new_object.object_id, fields: fields.gsub("\n", "") } do
+        name || capture(&block)
+      end
+    end
   end
 end

data/app/mailers/radesk/user_mailer.rb

@@ -2,10 +2,11 @@ module Radesk
   class UserMailer < ActionMailer::Base
     default :from => Radesk.email_from
 
-    def new_answer(ticket_id)
-      @ticket = Radesk::Ticket.find(ticket_id)
-
-      mail(:to => @ticket.user.email, :subject => 'New answer')
+    def new_answer(answer)
+      @ticket = answer.ticket
+      if answer.user.id != answer.ticket.user.id && !answer.private?
+        mail(:to => @ticket.user.email, :subject => 'New answer')
+      end
     end
   end
 end

data/app/models/radesk/activity.rb

@@ -0,0 +1,6 @@
+module Radesk
+  class Activity < ActiveRecord::Base
+    belongs_to :user, :class_name => Radesk.user_class_name.to_s, :foreign_key => :user_id
+    belongs_to :trackable, polymorphic: true
+  end
+end

data/app/models/radesk/answer.rb

@@ -1,14 +1,18 @@
 module Radesk
   class Answer < ActiveRecord::Base
+    include Radesk::Concerns::Access
+    include Radesk::ActivitiesHelper
+    
     belongs_to :user, :class_name => Radesk.user_class_name.to_s, :foreign_key => :user_id
     belongs_to :ticket
+    has_many :uploads
+
+    accepts_nested_attributes_for :uploads
 
     validates_presence_of :message
 
     scope :without_private, -> { where(:private => false) }
 
-    def has_access?(user)
-      self.user_id == user.id || user.try(:radesk_admin?)
-    end
+    after_destroy { |answer| destroy_activities(answer) }
   end
 end

data/app/models/radesk/concerns/access.rb

@@ -0,0 +1,9 @@
+module Radesk
+  module Concerns
+    module Access
+      def has_access?(user)
+        self.user_id == user.id || user.try(:radesk_admin?)
+      end
+    end
+  end
+end

data/app/models/radesk/ticket.rb

@@ -1,15 +1,18 @@
 module Radesk
   class Ticket < ActiveRecord::Base
+    include Radesk::Concerns::Access
+    include Radesk::ActivitiesHelper
+
     belongs_to :user, :class_name => Radesk.user_class_name.to_s, :foreign_key => :user_id
     belongs_to :category
-    has_many :answers
+    has_many :answers, :dependent => :destroy
+
+    accepts_nested_attributes_for :answers
 
-    validates_presence_of :title, :message
+    validates_presence_of :title
 
     default_scope { order('closed ASC').order('id DESC') }
 
-    def has_access?(user)
-      self.user_id == user.id || user.try(:radesk_admin?)
-    end
+    after_destroy { |ticket| destroy_activities(ticket) }
   end
 end