radesk 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80c2d3bcf9200c4e8069b2816db0d5103b1e8193
-  data.tar.gz: f5b0a5dd1cbd1db19deaea05b19b4d71066ba6b0
+  metadata.gz: e21822e2307c3ba267990f78e659d2e01c485d03
+  data.tar.gz: 38fe0c25966b0d8cdd4861ae4e79dc86c0972fca
 SHA512:
-  metadata.gz: a05e249d22ab0c5cddb0c823cdddf8cc8aced2882b63ee4670157eda4450a986f9532a5028e4a3f7e1d1c1a8ec08788caaedb947a2849dadf5b281178becb228
-  data.tar.gz: 13126462950b6c365e101767b927ca8a1dce4f91e239570000e39ed89ca4465956c7f5334fc9498de906ea9dc5173e80e3f12cfdd1debb222250487912c59b12
+  metadata.gz: 4160d1ffb3014a8989ee0d8c7091ced33286e6cf62ba59580a792199ce41bb34b56d9f8bbd8623939d09401f973b7131cf7a054fdc09d83bfd005202ff190df1
+  data.tar.gz: e7a0367794e19d5de1fdcc63c0e01226dcaec0331f00e0bf0c638472105cfb85493ab7d4961fc390bbd7a18ea20653bfc2b200e28e1f8fe4fe536ce0d206a80e

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

@@ -3,7 +3,13 @@ $dark_color: #3e3e3e;
 $light_color: #f6f6f6;
 
 #radesk {
-  * { margin: 0; padding: 0; }
+  * { 
+    margin: 0;
+    padding: 0;
+    &:focus {
+      outline: none;
+    }
+  }
   a { 
     color: $dark_color; 
     text-decoration: none;
@@ -22,6 +28,12 @@ $light_color: #f6f6f6;
     margin: 0 auto;
   }
 
+  .notice {
+    background: $main_color;
+    color: #fff;
+    padding: 12px 0;
+  }
+
   .nav {
     border-bottom: 1px solid darken($light_color, 5%);
     padding: 12px 0;
@@ -70,6 +82,17 @@ $light_color: #f6f6f6;
         &.status {
           width: 20px;
         }
+        &.user, &.created_at {
+          white-space: nowrap;
+          padding-left: 10px;
+        }
+        .title {
+          height: 14px;
+          overflow: hidden;
+        }
+        .message {
+          color: darken($light_color, 20%);
+        }
       }
     }
   }

data/app/controllers/radesk/answers_controller.rb

@@ -12,7 +12,9 @@ module Radesk
       @answer.ticket_id = params[:ticket_id]
 
       if @answer.save
-        render 'update_answers'
+        redirect_to @answer.ticket, notice: 'Answer was successfully created.'
+      else
+        redirect_to :back, notice: @answer.errors.full_messages.first
       end
     end
 
@@ -26,7 +28,7 @@ module Radesk
 
     def destroy
       @answer.destroy
-      redirect_to @answer.ticket, notice: notice
+      redirect_to @answer.ticket, notice: 'Answer was successfully destroyed.'
     end
 
     private
@@ -35,7 +37,7 @@ module Radesk
       end
 
       def check_access
-        redirect_to :back unless radesk_current_user.id == @answer.user_id || radesk_current_user.try(:radesk_admin?)
+        redirect_to :back unless @answer.has_access?(radesk_current_user)
       end
 
       def answer_params

data/app/controllers/radesk/tickets_controller.rb

@@ -27,18 +27,22 @@ module Radesk
     end
 
     def destroy
-      @ticket.destroy
-      redirect_to tickets_url, notice: 'Ticket was successfully destroyed.'
+      if radesk_current_user.try(:radesk_admin?)
+        @ticket.destroy
+        redirect_to tickets_url, notice: 'Ticket was successfully destroyed.'
+      else
+        redirect_to :back
+      end
     end
 
     def open
       @ticket.update(:closed => false)
-      render 'change_status'
+      render 'update_status'
     end
 
     def close
       @ticket.update(:closed => true)
-      render 'change_status'
+      render 'update_status'
     end
 
     private

data/app/models/radesk/answer.rb

@@ -2,5 +2,11 @@ module Radesk
   class Answer < ActiveRecord::Base
     belongs_to :user, :class_name => Radesk.user_class_name.to_s, :foreign_key => :user_id
     belongs_to :ticket
+
+    validates_presence_of :message
+
+    def has_access?(user)
+      self.user_id == user.id || user.try(:radesk_admin?)
+    end
   end
 end

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

@@ -8,6 +8,10 @@
     = csrf_meta_tags
   %body{ :style => 'margin: 0; background: #f6f6f6;' }
     #radesk
+      - if flash[:notice]
+        .notice
+          .wrap
+            = flash[:notice]
       .nav
         .wrap
           = link_to 'Home', '/'

data/app/views/radesk/answers/{_answers.html.haml → _list.html.haml}

@@ -7,7 +7,7 @@
       by
       %span
         = answer.user.email
-      - if radesk_current_user.try(:radesk_admin?)
+      - if answer.has_access?(radesk_current_user)
         %span.pull-right
           = link_to ticket_answer_path(answer.ticket, answer), :method => :delete do
             %i.fa.fa-close.light

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

@@ -13,10 +13,15 @@
             %span{ :class => "ticket-status-#{ticket.id}"}
               = render 'status', :ticket => ticket
           %td
-            = link_to ticket.title, ticket
+            .title
+              = link_to ticket do
+                %strong
+                  = ticket.title.truncate(100)
+                %span.message
+                  = ticket.message.truncate(100)
           - if radesk_current_user.try(:radesk_admin?)
-            %td
+            %td.user
               = ticket.user.email
-          %td.text-right
+          %td.created_at.text-right
             = ticket.created_at.strftime("%e %b %k:%M")
   = paginate @tickets

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

@@ -10,6 +10,10 @@
     by
     %span
       = @ticket.user.email
+    - if radesk_current_user.try(:radesk_admin?)
+      %span.pull-right
+        = link_to ticket_path(@ticket), :method => :delete do
+          %i.fa.fa-close.light
   .message
     = @ticket.message
 
@@ -17,10 +21,10 @@
   %h2
     Answers
   .answers
-    = render 'radesk/answers/answers', :answers => @answers
+    = render 'radesk/answers/list', :answers => @answers
 .create_answer
   .form
-    = form_for [@ticket, @ticket.answers.build], :remote => true do |f|
+    = 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

data/lib/radesk/version.rb

@@ -1,3 +1,3 @@
 module Radesk
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radesk
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sergey Novikov
@@ -184,15 +184,14 @@ files:
 - app/models/radesk/answer.rb
 - app/models/radesk/ticket.rb
 - app/views/layouts/radesk/application.html.haml
-- app/views/radesk/answers/_answers.html.haml
-- app/views/radesk/answers/update_answers.js.erb
+- app/views/radesk/answers/_list.html.haml
 - app/views/radesk/tickets/_form.html.haml
 - app/views/radesk/tickets/_status.html.haml
-- app/views/radesk/tickets/change_status.js.erb
 - app/views/radesk/tickets/edit.html.haml
 - app/views/radesk/tickets/index.html.haml
 - app/views/radesk/tickets/new.html.haml
 - app/views/radesk/tickets/show.html.haml
+- app/views/radesk/tickets/update_status.js.erb
 - config/routes.rb
 - db/migrate/20141226165609_create_radesk_tickets.rb
 - db/migrate/20141227023319_create_radesk_answers.rb

data/app/views/radesk/answers/update_answers.js.erb

@@ -1 +0,0 @@
-$(".answers").html("<%= escape_javascript(render 'answers', :answers => @answer.ticket.answers).html_safe %>");