Allow attachment view when ticket can be viewed. Temp disable reply t…

…o others tickets
ivaldi · Aug 1, 2014 · 023edf5 · 023edf5
1 parent f1f9977
commit 023edf5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
@@ -19,7 +19,11 @@ class AttachmentsController < ApplicationController
   def show
     @attachment = Attachment.find(params[:id])
 
-    authorize! :read, @attachment.attachable
+    if @attachment.attachable_type == 'Ticket'
+      authorize! :read, @attachment.attachable
+    else
+      authorize! :read, @attachment.attachable.ticket
+    end
 
     begin
       if params[:format] == 'thumb'

diff --git a/app/models/reply.rb b/app/models/reply.rb
@@ -29,7 +29,7 @@ class Reply < ActiveRecord::Base
   scope :chronologically, -> { order(:id) }
 
   def notify
-    self.content += "\n\n" + self.user.signature.to_s
+    self.content += '<br /><br />' + self.user.signature.to_s
 
     mail = yield(self)