jro_apps/redmine Commit - r3201:1827d609a1b4

Cleaned up the IssueController redirects to use the back_url like the other actions....

Eric Davis -

r3201:1827d609a1b4

parent child

Context file:

r3201:1827d609a1b4

Collapse all files

app/controllers/issues_controller.rb +2 -2

                       end
                       call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
                       respond_to do |format|
-                        format.html { redirect_to(params[:back_to] || {:action => 'show', :id => @issue}) }
+                        format.html { redirect_back_or_default({:action => 'show', :id => @issue}) }
                         format.xml  { head :ok }
                       end
                       return
                                                                      :total => @issues.size,
                                                                      :ids => '#' + unsaved_issue_ids.join(', #'))
                   end
-                  redirect_to(params[:back_to] || {:controller => 'issues', :action => 'index', :project_id => @project})
+                  redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
                   return
                 end
                 @available_statuses = Workflow.available_statuses(@project)

app/views/issues/context_menu.rhtml +10 -10

             		<a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
             		<ul>
             		<% @statuses.each do |s| -%>
-            		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'edit', :id => @issue, :issue => {:status_id => s}, :back_to => @back}, :method => :post,
+            		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'edit', :id => @issue, :issue => {:status_id => s}, :back_url => @back}, :method => :post,
             		                              :selected => (s == @issue.status), :disabled => !(@can[:update] && @allowed_statuses.include?(s)) %></li>
             		<% end -%>
             		</ul>
             		<a href="#" class="submenu"><%= l(:field_tracker) %></a>
             		<ul>
             		<% @trackers.each do |t| -%>
-            		    <li><%= context_menu_link t.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'tracker_id' => t, :back_to => @back}, :method => :post,
+            		    <li><%= context_menu_link t.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'tracker_id' => t, :back_url => @back}, :method => :post,
             		                              :selected => (@issue && t == @issue.tracker), :disabled => !@can[:edit] %></li>
             		<% end -%>
             		</ul>
             		<a href="#" class="submenu"><%= l(:field_priority) %></a>
             		<ul>
             		<% @priorities.each do |p| -%>
-            		    <li><%= context_menu_link p.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'priority_id' => p, :back_to => @back}, :method => :post,
+            		    <li><%= context_menu_link p.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'priority_id' => p, :back_url => @back}, :method => :post,
             		                              :selected => (@issue && p == @issue.priority), :disabled => !@can[:edit] %></li>
             		<% end -%>
             		</ul>
             		<a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
             		<ul>
             		<% @project.shared_versions.open.sort.each do |v| -%>
-            		    <li><%= context_menu_link format_version_name(v), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'fixed_version_id' => v, :back_to => @back}, :method => :post,
+            		    <li><%= context_menu_link format_version_name(v), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'fixed_version_id' => v, :back_url => @back}, :method => :post,
             		                              :selected => (@issue && v == @issue.fixed_version), :disabled => !@can[:update] %></li>
             		<% end -%>
-            		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'fixed_version_id' => 'none', :back_to => @back}, :method => :post,
+            		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'fixed_version_id' => 'none', :back_url => @back}, :method => :post,
             		                              :selected => (@issue && @issue.fixed_version.nil?), :disabled => !@can[:update] %></li>
             		</ul>
             	</li>
             		<a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
             		<ul>
             		<% @assignables.each do |u| -%>
-            		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'assigned_to_id' => u, :back_to => @back}, :method => :post,
+            		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'assigned_to_id' => u, :back_url => @back}, :method => :post,
             		                              :selected => (@issue && u == @issue.assigned_to), :disabled => !@can[:update] %></li>
             		<% end -%>
-            		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'assigned_to_id' => 'none', :back_to => @back}, :method => :post,
+            		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'assigned_to_id' => 'none', :back_url => @back}, :method => :post,
             		                              :selected => (@issue && @issue.assigned_to.nil?), :disabled => !@can[:update] %></li>
             		</ul>
             	</li>
             		<a href="#" class="submenu"><%= l(:field_category) %></a>
             		<ul>
             		<% @project.issue_categories.each do |u| -%>
-            		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'category_id' => u, :back_to => @back}, :method => :post,
+            		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'category_id' => u, :back_url => @back}, :method => :post,
             		                              :selected => (@issue && u == @issue.category), :disabled => !@can[:update] %></li>
             		<% end -%>
-            		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'category_id' => 'none', :back_to => @back}, :method => :post,
+            		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'category_id' => 'none', :back_url => @back}, :method => :post,
             		                              :selected => (@issue && @issue.category.nil?), :disabled => !@can[:update] %></li>
             		</ul>
             	</li>
             		<a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
             		<ul>
             		<% (0..10).map{|x|x*10}.each do |p| -%>
-            		    <li><%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'done_ratio' => p, :back_to => @back}, :method => :post,
+            		    <li><%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'done_ratio' => p, :back_url => @back}, :method => :post,
             		                                  :selected => (@issue && p == @issue.done_ratio), :disabled => !@can[:edit] %></li>
             		<% end -%>
             		</ul>

test/functional/issues_controller_test.rb +46 0

@@ -947,6 +947,36 class IssuesControllerTest < ActionController::TestCase
947	assert_equal 4, issue.fixed_version_id	947	assert_equal 4, issue.fixed_version_id
948	assert_not_equal issue.project_id, issue.fixed_version.project_id	948	assert_not_equal issue.project_id, issue.fixed_version.project_id
949	end	949	end
		950
		951	def test_post_edit_should_redirect_back_using_the_back_url_parameter
		952	issue = Issue.find(2)
		953	@request.session[:user_id] = 2
		954
		955	post :edit,
		956	:id => issue.id,
		957	:issue => {
		958	:fixed_version_id => 4
		959	},
		960	:back_url => '/issues'
		961
		962	assert_response :redirect
		963	assert_redirected_to '/issues'
		964	end
		965
		966	def test_post_edit_should_not_redirect_back_using_the_back_url_parameter_off_the_host
		967	issue = Issue.find(2)
		968	@request.session[:user_id] = 2
		969
		970	post :edit,
		971	:id => issue.id,
		972	:issue => {
		973	:fixed_version_id => 4
		974	},
		975	:back_url => 'http://google.com'
		976
		977	assert_response :redirect
		978	assert_redirected_to :controller => 'issues', :action => 'show', :id => issue.id
		979	end
950		980
951	def test_get_bulk_edit	981	def test_get_bulk_edit
952	@request.session[:user_id] = 2	982	@request.session[:user_id] = 2
@@ -1053,6 +1083,22 class IssuesControllerTest < ActionController::TestCase
1053	end	1083	end
1054	end	1084	end
1055		1085
		1086	def test_post_bulk_edit_should_redirect_back_using_the_back_url_parameter
		1087	@request.session[:user_id] = 2
		1088	post :bulk_edit, :ids => [1,2], :back_url => '/issues'
		1089
		1090	assert_response :redirect
		1091	assert_redirected_to '/issues'
		1092	end
		1093
		1094	def test_post_bulk_edit_should_not_redirect_back_using_the_back_url_parameter_off_the_host
		1095	@request.session[:user_id] = 2
		1096	post :bulk_edit, :ids => [1,2], :back_url => 'http://google.com'
		1097
		1098	assert_response :redirect
		1099	assert_redirected_to :controller => 'issues', :action => 'index', :project_id => Project.find(1).identifier
		1100	end
		1101
1056	def test_move_routing	1102	def test_move_routing
1057	assert_routing(	1103	assert_routing(
1058	{:method => :get, :path => '/issues/1/move'},	1104	{:method => :get, :path => '/issues/1/move'},

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages