From e1c0b7f23d7be1d8f3139aa255bd121969ece97a Mon Sep 17 00:00:00 2001 From: jessib Date: Tue, 22 Jan 2013 11:12:37 -0800 Subject: Translate text rather than having it in code directly. --- help/app/controllers/tickets_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'help/app/controllers/tickets_controller.rb') diff --git a/help/app/controllers/tickets_controller.rb b/help/app/controllers/tickets_controller.rb index b613088..372ff6e 100644 --- a/help/app/controllers/tickets_controller.rb +++ b/help/app/controllers/tickets_controller.rb @@ -24,7 +24,8 @@ class TicketsController < ApplicationController end flash[:notice] = 'Ticket was successfully created.' if @ticket.save if !logged_in? - flash[:notice] = flash[:notice] + ' You can later access this ticket at the url ' + request.protocol + request.host_with_port + ticket_path(@ticket.id) + '. You might want to bookmark this page to find it again. Anybody with this URL will be able to access this ticket, so if you are on a shared computer you might want to remove it from the browser history' #todo + # cannot set this until ticket has been saved, as @ticket.id will not be set + flash[:notice] += " " + t(:access_ticket_text, :full_url => request.protocol + request.host_with_port + ticket_path(@ticket.id)) end respond_with(@ticket) -- cgit v1.2.3 From dea7680b7260224beb2d2b8b901310f27d7337b0 Mon Sep 17 00:00:00 2001 From: jessib Date: Tue, 22 Jan 2013 11:17:10 -0800 Subject: Makes tickets_controller a bit less complex. --- help/app/controllers/tickets_controller.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'help/app/controllers/tickets_controller.rb') diff --git a/help/app/controllers/tickets_controller.rb b/help/app/controllers/tickets_controller.rb index 372ff6e..3ccebb3 100644 --- a/help/app/controllers/tickets_controller.rb +++ b/help/app/controllers/tickets_controller.rb @@ -15,13 +15,11 @@ class TicketsController < ApplicationController def create @ticket = Ticket.new(params[:ticket]) - if logged_in? - @ticket.created_by = current_user.id - @ticket.email = current_user.email if current_user.email - @ticket.comments.last.posted_by = current_user.id - else - @ticket.comments.last.posted_by = nil #hacky, but protecting this attribute doesn't work right, so this should make sure it isn't set. - end + + @ticket.comments.last.posted_by = (logged_in? ? current_user.id : nil) #protecting posted_by isn't working, so this should protect it. + @ticket.created_by = current_user.id if logged_in? + @ticket.email = current_user.email if logged_in? and current_user.email + flash[:notice] = 'Ticket was successfully created.' if @ticket.save if !logged_in? # cannot set this until ticket has been saved, as @ticket.id will not be set -- cgit v1.2.3 From 7cdb14e2a6584eb838945b00fe2840b3e8c211e3 Mon Sep 17 00:00:00 2001 From: jessib Date: Tue, 22 Jan 2013 11:26:15 -0800 Subject: More minor cleanup of tickets controller --- help/app/controllers/tickets_controller.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'help/app/controllers/tickets_controller.rb') diff --git a/help/app/controllers/tickets_controller.rb b/help/app/controllers/tickets_controller.rb index 3ccebb3..bab795a 100644 --- a/help/app/controllers/tickets_controller.rb +++ b/help/app/controllers/tickets_controller.rb @@ -21,10 +21,9 @@ class TicketsController < ApplicationController @ticket.email = current_user.email if logged_in? and current_user.email flash[:notice] = 'Ticket was successfully created.' if @ticket.save - if !logged_in? - # cannot set this until ticket has been saved, as @ticket.id will not be set - flash[:notice] += " " + t(:access_ticket_text, :full_url => request.protocol + request.host_with_port + ticket_path(@ticket.id)) - end + + # cannot set this until ticket has been saved, as @ticket.id will not be set + flash[:notice] += " " + t(:access_ticket_text, :full_url => request.protocol + request.host_with_port + ticket_path(@ticket.id)) if !logged_in? respond_with(@ticket) end -- cgit v1.2.3 From 4057fba83719687284a4fc5542d1d0cb6f1f86e9 Mon Sep 17 00:00:00 2001 From: jessib Date: Thu, 24 Jan 2013 09:51:01 -0800 Subject: Use ticket_url to get URL for unauthenticated ticket creation, and only flash that message if the ticket already has a flash[:message] (and thus was saved successfully) --- help/app/controllers/tickets_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'help/app/controllers/tickets_controller.rb') diff --git a/help/app/controllers/tickets_controller.rb b/help/app/controllers/tickets_controller.rb index bab795a..d5a3da7 100644 --- a/help/app/controllers/tickets_controller.rb +++ b/help/app/controllers/tickets_controller.rb @@ -23,7 +23,7 @@ class TicketsController < ApplicationController flash[:notice] = 'Ticket was successfully created.' if @ticket.save # cannot set this until ticket has been saved, as @ticket.id will not be set - flash[:notice] += " " + t(:access_ticket_text, :full_url => request.protocol + request.host_with_port + ticket_path(@ticket.id)) if !logged_in? + flash[:notice] += " " + t(:access_ticket_text, :full_url => ticket_url(@ticket.id)) if !logged_in? and flash[:notice] respond_with(@ticket) end -- cgit v1.2.3