diff options
| author | jessib <jessib@riseup.net> | 2012-11-08 11:03:03 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-11-08 11:03:03 -0800 |
| commit | ce65965c536ed873d30246db074b5236d3185f47 (patch) | |
| tree | 6a33448f60c22952c853624bf9efdafe53b60576 /help/app/controllers | |
| parent | 677f4be6177f78f3b40e78e4ec53b0332b55d92c (diff) | |
Do not overwrite initializer in tickets_controller, as that meant we weren't using the default layout.
Diffstat (limited to 'help/app/controllers')
| -rw-r--r-- | help/app/controllers/tickets_controller.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/help/app/controllers/tickets_controller.rb b/help/app/controllers/tickets_controller.rb index d66647f..f3184ef 100644 --- a/help/app/controllers/tickets_controller.rb +++ b/help/app/controllers/tickets_controller.rb @@ -3,11 +3,7 @@ class TicketsController < ApplicationController respond_to :html #, :json #has_scope :open, :type => boolean - def initialize - @post_reply_str = 'Post reply' #t :post_reply - # @close_str = 'Close ticket' #t :close_ticket - @reply_close_str = 'Reply and close' #t :reply_and_close - end + before_filter :set_strings def new @ticket = Ticket.new @@ -58,7 +54,7 @@ class TicketsController < ApplicationController else params[:ticket][:comments_attributes] = nil if params[:ticket][:comments_attributes].values.first[:body].blank? #unset comments hash if no new comment was typed @ticket.attributes = params[:ticket] #this will call comments_attributes= - #@ticket.is_open = false if params[:commit] == @reply_close_str #this overrides is_open selection + # @ticket.is_open = false if params[:commit] == @reply_close_str #this overrides is_open selection @ticket.close if params[:commit] == @reply_close_str #this overrides is_open selection # what if there is an update and no new comment? Confirm that there is a new comment to update posted_by: @@ -83,6 +79,7 @@ class TicketsController < ApplicationController #below is obviously too messy and not what we want, but wanted to get basic functionality there if admin? + # todo: for admins, might want option to see tickets they have already posted to. want to use something like tickets_by_admin if params[:status] == 'open' @tickets = Ticket.by_is_open.key(true) elsif params[:status] == 'closed' @@ -123,6 +120,11 @@ class TicketsController < ApplicationController access_denied unless ticket_access? end + + def set_strings + @post_reply_str = 'Post reply' #t :post_reply + @reply_close_str = 'Reply and close' #t :reply_and_close + end # not using now, as we are using comment_attributes= from the Ticket model =begin def add_comment |