radesk 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f7b38ad11a78e20bbeae91ceda73bcaa435ccc4
-  data.tar.gz: f8e6211a2b5a4e7acdee34acad6cddc138483c81
+  metadata.gz: cc951107bd076dc1fa44b4c559672d1d8f368fff
+  data.tar.gz: 8dbf8b5bd494980eed407be55f7f836d66989136
 SHA512:
-  metadata.gz: 6e4e2b7b1172f28bb91c20e9636602417ac1fcba77660f91be54744aa61ba3900654d1e03183055e826138fbc0b285f8949c72d170894a3d81dd02a5c2335e34
-  data.tar.gz: dd66ec2fff5b137b90c58ec552760c9a4d4751d506fa471c5f7f1e760d986237d21bbd36b75dea21cfc23c734450ae3a80ec92f55b4f2dcadec5d5073442c6e2
+  metadata.gz: 1f5572478e61d09ba31065e1fc8a7356784076d13f763c6a0d20fa5ed6c16eacbbb40522114e3d21bcd96512976a472ed148d8f3f1383e70fd56de29cdd27879
+  data.tar.gz: 21a91363a3e735fddce8cbc3fc50d0dea6d87fd94693f492c0ff3eeeaf65ca2eaf593acb0c9df3c0afc26f8e0489927f3dbedec7542f3a6af84160bf1570896d

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

@@ -28,6 +28,8 @@ $light_color: #f6f6f6;
     margin: 0 auto;
   }
 
+
+
   .notice {
     background: $main_color;
     color: #fff;
@@ -36,7 +38,7 @@ $light_color: #f6f6f6;
 
   .nav {
     border-bottom: 1px solid darken($light_color, 5%);
-    padding: 12px 0;
+    line-height: 40px;
     margin-bottom: 40px;
     a {
       font-weight: bold;
@@ -68,7 +70,7 @@ $light_color: #f6f6f6;
     }
   }
 
-  .tickets {
+  .table {
     width: 100%;
     border-collapse: collapse;
     margin-bottom: 20px;
@@ -112,6 +114,15 @@ $light_color: #f6f6f6;
     }
   }
 
+  .ticket-category {
+    background: $light_color;
+    border: 1px solid darken($light_color, 5%);
+    padding: 5px 7px;
+    border-radius: 3px;
+    font-size: 10px;
+    color: $dark_color;
+  }
+
   .ticket {
     margin-bottom: 40px;
     .message {
@@ -121,18 +132,27 @@ $light_color: #f6f6f6;
     .info {
       margin-bottom: 20px;
       color: darken($light_color, 20%);
+      span {
+        margin-left: 10px;
+      }
     }
   }
   
   .answers {
     margin-bottom: 40px;
     .answer {
-      padding-top: 20px;
-      margin-bottom: 20px;
+      padding: 20px 0;
       border-top: 1px solid darken($light_color, 5%);
+      &.private {
+        background: $light_color;
+        padding: 20px;
+      }
       .info {
         margin-bottom: 10px;
         color: darken($light_color, 20%);
+        span {
+          margin-left: 10px;
+        }
       }
       .message {
         font-size: 14px;
@@ -143,9 +163,7 @@ $light_color: #f6f6f6;
 
   .btn {
     display: inline-block;
-    height: 34px;
-    line-height: 34px;
-    padding: 0 13px;
+    padding: 8px 13px;
     background: $main_color;
     border: 1px solid $main_color;
     color: #fff;
@@ -167,30 +185,32 @@ $light_color: #f6f6f6;
 
   .form {
     overflow: hidden;
-    padding: 20px 20px 0;
     margin-bottom: 40px;
-    background: #fff;
-    border-radius: 3px;
     .form-group {
       margin-bottom: 20px;
       label {
         display: block;
         margin-bottom: 5px;
-        color: $main_color;
-        font-weight: bold;
       }
       .form-control {
-        background: #fff;
-        width: 100%;
-        border: 1px solid darken($light_color, 5%);
-        border-radius: 5px;
-        font-family: 'Arial';
-        font-size: 12px;
-        box-sizing: border-box;
-        padding: 10px;
+        &[type=text], &.textarea, &.select {
+          background: #fff;
+          width: 100%;
+          border: 1px solid darken($light_color, 5%);
+          border-radius: 5px;
+          font-family: 'Arial';
+          font-size: 12px;
+          box-sizing: border-box;
+          -webkit-appearance: none;
+          padding: 10px;
+        }
         &:focus {
           outline: none;
         }
+        &[type=checkbox] {
+          vertical-align: text-top;
+          margin-right: 5px;
+        }
       }
     }
   }

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

@@ -0,0 +1,56 @@
+require_dependency "radesk/application_controller"
+
+module Radesk
+  module Admin
+    class CategoriesController < ApplicationController
+      before_action :set_category, only: [:show, :destroy, :edit, :update]
+      before_action :radesk_authorize_admin!
+
+      def index
+        @categories = Category.all
+      end
+
+      def show
+      end
+
+      def new
+        @category = Category.new
+      end
+
+      def create
+        @category = Category.new(category_params)
+
+        if @category.save
+          redirect_to admin_categories_path, notice: 'Category was successfully created.'
+        else
+          redirect_to admin_categories_path
+        end
+      end
+
+      def edit
+      end
+
+      def update
+        if @category.update(category_params)
+          redirect_to admin_categories_path, notice: 'Category was successfully updated.'
+        else
+          render :edit
+        end
+      end
+
+      def destroy
+        @category.destroy
+        redirect_to admin_categories_path, notice: 'Category was successfully destroyed.'
+      end
+
+      private
+        def set_category
+          @category = Category.find(params[:id])
+        end
+
+        def category_params
+          params.require(:category).permit(:title)
+        end
+    end
+  end
+end

data/app/controllers/radesk/answers_controller.rb

@@ -12,7 +12,7 @@ module Radesk
       @answer.ticket_id = params[:ticket_id]
 
       if @answer.save
-        if @answer.user.id != @answer.ticket.user.id 
+        if @answer.user.id != @answer.ticket.user.id && !@answer.user.radesk_admin?
           UserMailer.new_answer(@answer.ticket.id).deliver 
         end
         redirect_to @answer.ticket, notice: 'Answer was successfully created.'
@@ -21,6 +21,9 @@ module Radesk
       end
     end
 
+    def edit
+    end
+
     def update
       if @answer.update(answer_params)
         redirect_to @answer.ticket, notice: 'Answer was successfully updated.'
@@ -44,7 +47,7 @@ module Radesk
       end
 
       def answer_params
-        params.require(:answer).permit(:message)
+        params.require(:answer).permit(:message, :private)
       end
   end
 end

data/app/controllers/radesk/application_controller.rb

@@ -8,5 +8,9 @@ module Radesk
     def radesk_authorize!
       redirect_to '/' if !(radesk_current_user)
     end
+
+    def radesk_authorize_admin!
+      redirect_to root_path if !(radesk_current_user.radesk_admin?)
+    end
   end
 end

data/app/controllers/radesk/tickets_controller.rb

@@ -2,17 +2,24 @@ require_dependency "radesk/application_controller"
 
 module Radesk
   class TicketsController < ApplicationController
-    before_action :set_ticket, only: [:show, :destroy, :open, :close]
+    before_action :set_ticket, only: [:show, :edit, :update, :destroy, :open, :close]
+    before_action :check_access, only: [:show, :edit, :update, :destroy]
     before_action :radesk_authorize!
 
     def index
-      @tickets = Ticket.includes(Radesk.user_class_name.downcase.to_sym).all.page(params[:page]).per(10)
+      @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?)
-      @ticket = Ticket.new
     end
 
     def show
       @answers = @ticket.answers.includes(Radesk.user_class_name.downcase.to_sym)
+      unless radesk_current_user.radesk_admin?
+        @answers = @answers.without_private
+      end
+    end
+
+    def new
+      @ticket = Ticket.new
     end
 
     def create
@@ -22,7 +29,18 @@ module Radesk
       if @ticket.save
         redirect_to @ticket, notice: 'Ticket was successfully created.'
       else
-        redirect_to tickets_path
+        render :new
+      end
+    end
+
+    def edit
+    end
+
+    def update
+      if @ticket.update(ticket_params)
+        redirect_to @ticket, notice: 'Ticket was successfully updated.'
+      else
+        render :edit
       end
     end
 
@@ -50,8 +68,12 @@ module Radesk
         @ticket = Ticket.find(params[:id])
       end
 
+      def check_access
+        redirect_to :back unless @ticket.has_access?(radesk_current_user)
+      end
+
       def ticket_params
-        params.require(:ticket).permit(:title, :message, :closed)
+        params.require(:ticket).permit(:title, :message, :closed, :category_id)
       end
   end
 end

data/app/models/radesk/answer.rb

@@ -1,10 +1,12 @@
 module Radesk
   class Answer < ActiveRecord::Base
     belongs_to :user, :class_name => Radesk.user_class_name.to_s, :foreign_key => :user_id
-    belongs_to :ticket, :counter_cache => true
+    belongs_to :ticket
 
     validates_presence_of :message
 
+    scope :without_private, -> { where(:private => false) }
+
     def has_access?(user)
       self.user_id == user.id || user.try(:radesk_admin?)
     end

data/app/models/radesk/category.rb

@@ -0,0 +1,7 @@
+module Radesk
+  class Category < ActiveRecord::Base
+    has_many :tickets
+
+    validates_presence_of :title
+  end
+end

data/app/models/radesk/ticket.rb

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

data/app/views/layouts/radesk/application.html.haml

@@ -6,7 +6,7 @@
     = stylesheet_link_tag    "radesk/application", media: "all"
     = javascript_include_tag "radesk/application"
     = csrf_meta_tags
-  %body{ :style => 'margin: 0; background: #f6f6f6;' }
+  %body{ :style => 'margin: 0;' }
     #radesk
       - if flash[:notice]
         .notice
@@ -17,6 +17,7 @@
           = link_to 'Home', '/'
           = link_to 'Tickets', tickets_path
           - if radesk_current_user.try(:radesk_admin?)
+            = link_to 'Categories', admin_categories_path
             %span.pull-right
               Logged as administrator
       .wrap

data/app/views/radesk/admin/categories/_form.html.haml

@@ -0,0 +1,7 @@
+.form
+  = form_for [:admin, @category] do |f|
+    .form-group
+      = f.label :title
+      = f.text_field :title, :class => 'form-control', :required => true
+    .form-group.text-right
+      = f.submit 'Save Category', :class => 'btn'

data/app/views/radesk/admin/categories/edit.html.haml

@@ -0,0 +1,3 @@
+%h1
+  Edit category
+= render 'form'

data/app/views/radesk/admin/categories/index.html.haml

@@ -0,0 +1,14 @@
+%h1
+  Categories
+  = link_to "New Category", new_admin_category_path, :class => 'btn pull-right'
+- if @categories.any?
+  %table.table
+    - @categories.each do |category|
+      %tr
+        %td
+          = category.title
+        %td.text-right
+          = link_to edit_admin_category_path(category) do
+            %i.fa.fa-pencil.light
+          = link_to admin_category_path(category), :method => :delete do
+            %i.fa.fa-close.light

data/app/views/radesk/admin/categories/new.html.haml

@@ -0,0 +1,4 @@
+%h1
+  New category
+.form
+  = render 'form'

data/app/views/radesk/answers/_list.html.haml

@@ -1,14 +1,18 @@
 - answers.each do |answer|
-  .answer
+  .answer{ :class => ('private' if answer.private?) }
     .info
-      Added
-      %span
-        = answer.created_at.strftime("%e %b %k:%M")
+      - if answer.private?
+        %strong
+          Private answer
+      = "#{time_ago_in_words(answer.created_at)} ago"
+      = answer.created_at.strftime("(%-d %b %k:%M)")
       by
-      %span
-        = answer.user.email
+      = answer.user.email
       - if answer.has_access?(radesk_current_user)
-        %span.pull-right
+        %span
+          = link_to edit_ticket_answer_path(answer.ticket, answer) do
+            %i.fa.fa-pencil.light
+        %span
           = link_to ticket_answer_path(answer.ticket, answer), :method => :delete do
             %i.fa.fa-close.light
     .message

data/app/views/radesk/answers/edit.html.haml

@@ -0,0 +1,7 @@
+.form
+  = form_for [@answer.ticket, @answer] do |f|
+    .form-group
+      = f.label :message
+      = f.text_area :message, :class => 'form-control', :rows => 10, :required => true
+    .form-group.text-right
+      = f.submit 'Save Answer', :class => 'btn'

data/app/views/radesk/tickets/_form.html.haml

@@ -5,6 +5,9 @@
       = f.text_field :title, :class => 'form-control', :required => true
     .form-group
       = f.label :message
-      = f.text_area :message, :class => 'form-control', :rows => 10, :required => true
+      = f.text_area :message, :class => 'form-control textarea', :rows => 10, :required => true
+    .form-group
+      = f.label :category_id
+      = f.select :category_id, Radesk::Category.all.map{ |c| [c.title, c.id] }, {}, :class => 'form-control select'
     .form-group.text-right
-      = f.submit 'Create New Ticket', :class => 'btn'
+      = f.submit 'Save Ticket', :class => 'btn'

data/app/views/radesk/tickets/index.html.haml

@@ -1,11 +1,8 @@
-%h1
-  Helpdesk
-.create_ticket
-  = render 'form'
 - if @tickets.any?
   %h1
-    Tickets history
-  %table.tickets
+    Tickets
+    = link_to "New Ticket", new_ticket_path, :class => 'btn pull-right'
+  %table.table
     %tbody
       - @tickets.each do |ticket|
         %tr
@@ -19,12 +16,11 @@
                   = ticket.title.truncate(100)
                 %span.message
                   = ticket.message.truncate(100)
-          - if radesk_current_user.try(:radesk_admin?)
-            %td.user
-              = ticket.user.email
-          %td.last-answer
-            %i.fa{ :class => "fa-comment#{'-o' unless ticket.answers.any? && ticket.answers.last.user != radesk_current_user}" }
-            = ticket.answers.size
+          %td
+            - if ticket.category
+              %span.ticket-category
+                = ticket.category.title
           %td.created_at.text-right
-            = ticket.created_at.strftime("%e %b %k:%M")
+            = "#{time_ago_in_words(ticket.created_at)} ago"
+            = ticket.created_at.strftime("(%-d %b %k:%M)")
   = paginate @tickets

data/app/views/radesk/tickets/new.html.haml

@@ -1,4 +1,4 @@
 %h1
-  Create New Ticket
+  Have a problem?
 .form
   = render 'form'

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

@@ -4,29 +4,39 @@
   = @ticket.title
 .ticket
   .info
-    Created
-    %span
-      = @ticket.created_at.strftime("%e %b %k:%M")
+    = "#{time_ago_in_words(@ticket.created_at)} ago"
+    = @ticket.created_at.strftime("(%-d %b %k:%M)")
     by
-    %span
-      = @ticket.user.email
+    = @ticket.user.email
     - if radesk_current_user.try(:radesk_admin?)
-      %span.pull-right
+      %span
+        = link_to edit_ticket_path(@ticket) do
+          %i.fa.fa-pencil.light
+      %span
         = link_to ticket_path(@ticket), :method => :delete do
           %i.fa.fa-close.light
+    - if @ticket.category
+      %span.ticket-category
+        = @ticket.category.title
   .message
     = @ticket.message
 
 - if @ticket.answers.any?
   %h2
-    Answers
+    = pluralize(@answers.count, 'answer')
   .answers
     = render 'radesk/answers/list', :answers => @answers
+%h2
+  Your Answer
 .create_answer
   .form
     = form_for [@ticket, @ticket.answers.build] do |f|
       .form-group
-        = f.label :message, 'Add Your Answer'
-        = f.text_area :message, :class => 'form-control', :rows => 5, :required => true
+        = f.text_area :message, :class => 'form-control textarea', :rows => 5, :required => true
+      - if radesk_current_user.radesk_admin?
+        .form-group.text-right
+          = f.label :private do
+            = f.check_box :private, :class => 'form-control'
+            Mark as private
       .form-group.text-right
         = f.submit 'Post Answer', :class => 'btn'

data/config/routes.rb

@@ -4,7 +4,11 @@ Radesk::Engine.routes.draw do
       get 'open'
       get 'close'
     end
-    resources :answers
+    resources :answers, :except => [:index, :show, :new]
+  end
+
+  namespace :admin do
+    resources :categories, :except => [:show]
   end
 
   root 'tickets#index'

data/db/migrate/20150101175807_add_private_to_radesk_answers.rb

@@ -0,0 +1,5 @@
+class AddPrivateToRadeskAnswers < ActiveRecord::Migration
+  def change
+    add_column :radesk_answers, :private, :boolean, :default => false
+  end
+end

data/db/migrate/20150102192027_create_radesk_categories.rb

@@ -0,0 +1,9 @@
+class CreateRadeskCategories < ActiveRecord::Migration
+  def change
+    create_table :radesk_categories do |t|
+      t.string :title
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20150103122745_add_category_id_to_radesk_tickets.rb

@@ -0,0 +1,5 @@
+class AddCategoryIdToRadeskTickets < ActiveRecord::Migration
+  def change
+    add_column :radesk_tickets, :category_id, :integer
+  end
+end

data/lib/radesk/version.rb

@@ -1,3 +1,3 @@
 module Radesk
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radesk
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sergey Novikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -189,6 +189,7 @@ files:
 - app/assets/javascripts/radesk/application.js
 - app/assets/stylesheets/radesk/application.css
 - app/assets/stylesheets/radesk/radesk.css.scss
+- app/controllers/radesk/admin/categories_controller.rb
 - app/controllers/radesk/answers_controller.rb
 - app/controllers/radesk/application_controller.rb
 - app/controllers/radesk/tickets_controller.rb
@@ -197,9 +198,15 @@ files:
 - app/helpers/radesk/tickets_helper.rb
 - app/mailers/radesk/user_mailer.rb
 - app/models/radesk/answer.rb
+- app/models/radesk/category.rb
 - app/models/radesk/ticket.rb
 - app/views/layouts/radesk/application.html.haml
+- app/views/radesk/admin/categories/_form.html.haml
+- app/views/radesk/admin/categories/edit.html.haml
+- app/views/radesk/admin/categories/index.html.haml
+- app/views/radesk/admin/categories/new.html.haml
 - app/views/radesk/answers/_list.html.haml
+- app/views/radesk/answers/edit.html.haml
 - app/views/radesk/tickets/_form.html.haml
 - app/views/radesk/tickets/_status.html.haml
 - app/views/radesk/tickets/edit.html.haml
@@ -211,7 +218,9 @@ files:
 - config/routes.rb
 - db/migrate/20141226165609_create_radesk_tickets.rb
 - db/migrate/20141227023319_create_radesk_answers.rb
-- db/migrate/20141231165849_add_answers_count_to_radesk_tickets.rb
+- db/migrate/20150101175807_add_private_to_radesk_answers.rb
+- db/migrate/20150102192027_create_radesk_categories.rb
+- db/migrate/20150103122745_add_category_id_to_radesk_tickets.rb
 - lib/generators/radesk/install/templates/initializer.rb
 - lib/generators/radesk/install_generator.rb
 - lib/radesk.rb

data/db/migrate/20141231165849_add_answers_count_to_radesk_tickets.rb

@@ -1,5 +0,0 @@
-class AddAnswersCountToRadeskTickets < ActiveRecord::Migration
-  def change
-    add_column :radesk_tickets, :answers_count, :integer, :default => 0
-  end
-end