summaryrefslogtreecommitdiff
path: root/help
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2013-08-15 00:03:00 -0700
committerazul <azul@riseup.net>2013-08-15 00:03:00 -0700
commitbe944809f6708be55a1111085b1483af3c646b14 (patch)
treee61ef82604a5ab404339fc6dbf3ba53bf0478d2a /help
parentbca39b8f0d44dc31f77a3bfc8a94d452b4c77670 (diff)
parent53cd653ade859ec240d14981c4e9f85cc62cd6fd (diff)
Merge pull request #66 from jessib/feature/comment_creation_access
Per ISEC informational issue, manually set the private property only in ...
Diffstat (limited to 'help')
-rw-r--r--help/app/controllers/tickets_controller.rb2
-rw-r--r--help/app/models/ticket_comment.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/help/app/controllers/tickets_controller.rb b/help/app/controllers/tickets_controller.rb
index 094612c..a03ef22 100644
--- a/help/app/controllers/tickets_controller.rb
+++ b/help/app/controllers/tickets_controller.rb
@@ -18,6 +18,7 @@ class TicketsController < ApplicationController
@ticket = Ticket.new(params[:ticket])
@ticket.comments.last.posted_by = (logged_in? ? current_user.id : nil) #protecting posted_by isn't working, so this should protect it.
+ @ticket.comments.last.private = false unless admin?
@ticket.created_by = current_user.id if logged_in?
@ticket.email = current_user.email_address if logged_in? and current_user.email_address
@@ -58,6 +59,7 @@ class TicketsController < ApplicationController
if @ticket.comments_changed?
@ticket.comments.last.posted_by = (current_user ? current_user.id : nil)
+ @ticket.comments.last.private = false unless admin?
end
if @ticket.changed?
diff --git a/help/app/models/ticket_comment.rb b/help/app/models/ticket_comment.rb
index 1df7eec..13bea2b 100644
--- a/help/app/models/ticket_comment.rb
+++ b/help/app/models/ticket_comment.rb
@@ -7,7 +7,7 @@ class TicketComment
property :posted_at, Time#, :protected => true
#property :posted_verified, TrueClass, :protected => true #should be true if current_user is set when the comment is created
property :body, String
- property :private, TrueClass # private comments are only viewable by admins
+ property :private, TrueClass # private comments are only viewable by admins #this is checked when set, to make sure it was set by an admin
# ? timestamps!
validates :body, :presence => true