Redirected user to where he is coming from after logging hours (#1062).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1354 e93f8b46-1217-0410-a6f0-8f06a7374b81

Redirected user to where he is coming from after logging hours (#1062).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1354 e93f8b46-1217-0410-a6f0-8f06a7374b81
1a4f8116 · Jean-Philippe Lang · 7061f737 · 1a4f8116 · 1a4f8116 · 1a4f8116
Commit 1a4f8116 authored Apr 16, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

timelog_controller.rb app/controllers/timelog_controller.rb +1 -1

application_helper.rb app/helpers/application_helper.rb +4 -0

edit.rhtml app/views/timelog/edit.rhtml +1 -0

No files found.
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -172,7 +172,7 @@ class TimelogController < ApplicationController
    @time_entry.attributes = params[:time_entry]
    if request.post? and @time_entry.save
      flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'details', :project_id => @time_entry.project
+      redirect_to(params[:back_url] || {:action => 'details', :project_id => @time_entry.project})
      return
    end    
    @activities = Enumeration::get_values('ACTI')

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -427,6 +427,10 @@ module ApplicationHelper
    form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
  end
  
+  def back_url_hidden_field_tag
+    hidden_field_tag 'back_url', (params[:back_url] || request.env['HTTP_REFERER'])
+  end
+  
  def check_all_links(form_name)
    link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
    " | " +

--- a/app/views/timelog/edit.rhtml
+++ b/app/views/timelog/edit.rhtml
@@ -2,6 +2,7 @@

 <% labelled_tabular_form_for :time_entry, @time_entry, :url => {:action => 'edit', :project_id => @time_entry.project} do |f| %>
 <%= error_messages_for 'time_entry' %>
+<%= back_url_hidden_field_tag %>

 <div class="box">
 <p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>