diff options
author | jessib <jessib@riseup.net> | 2013-08-12 12:00:11 -0700 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2013-08-12 12:00:11 -0700 |
commit | 83681dfe050ce2ae74d5d1ca451d495d48f029ba (patch) | |
tree | c5e053614999a3094e1bceef1e6e0cacb942d0d2 /help/app | |
parent | bca39b8f0d44dc31f77a3bfc8a94d452b4c77670 (diff) |
Per ISEC informational issue, manually set the private property only in cases where it is an admin who set it.
Diffstat (limited to 'help/app')
-rw-r--r-- | help/app/controllers/tickets_controller.rb | 2 | ||||
-rw-r--r-- | help/app/models/ticket_comment.rb | 2 |
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..b8d2c09 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 = true if admin? and @ticket.comments.last.private @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 = true if admin? and @ticket.comments.last.private 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 |