jro_apps/redmine Commit - r3202:f60881518a7a

Merged r3315 from trunk....

Eric Davis -

r3202:f60881518a7a

parent child

Context file:

r3202:f60881518a7a

Collapse all files

app/controllers/issues_controller.rb +2 -2

                       flash[:notice] = l(:notice_successful_update)
                     end
                     call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
-                    redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
+                    redirect_back_or_default({:action => 'show', :id => @issue})
                   end
                 end
               rescue ActiveRecord::StaleObjectError
                                                                      :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

@@ -940,6 +940,36 class IssuesControllerTest < ActionController::TestCase
940	assert_equal 4, issue.fixed_version_id	940	assert_equal 4, issue.fixed_version_id
941	assert_not_equal issue.project_id, issue.fixed_version.project_id	941	assert_not_equal issue.project_id, issue.fixed_version.project_id
942	end	942	end
		943
		944	def test_post_edit_should_redirect_back_using_the_back_url_parameter
		945	issue = Issue.find(2)
		946	@request.session[:user_id] = 2
		947
		948	post :edit,
		949	:id => issue.id,
		950	:issue => {
		951	:fixed_version_id => 4
		952	},
		953	:back_url => '/issues'
		954
		955	assert_response :redirect
		956	assert_redirected_to '/issues'
		957	end
		958
		959	def test_post_edit_should_not_redirect_back_using_the_back_url_parameter_off_the_host
		960	issue = Issue.find(2)
		961	@request.session[:user_id] = 2
		962
		963	post :edit,
		964	:id => issue.id,
		965	:issue => {
		966	:fixed_version_id => 4
		967	},
		968	:back_url => 'http://google.com'
		969
		970	assert_response :redirect
		971	assert_redirected_to :controller => 'issues', :action => 'show', :id => issue.id
		972	end
943		973
944	def test_get_bulk_edit	974	def test_get_bulk_edit
945	@request.session[:user_id] = 2	975	@request.session[:user_id] = 2
@@ -1046,6 +1076,22 class IssuesControllerTest < ActionController::TestCase
1046	end	1076	end
1047	end	1077	end
1048		1078
		1079	def test_post_bulk_edit_should_redirect_back_using_the_back_url_parameter
		1080	@request.session[:user_id] = 2
		1081	post :bulk_edit, :ids => [1,2], :back_url => '/issues'
		1082
		1083	assert_response :redirect
		1084	assert_redirected_to '/issues'
		1085	end
		1086
		1087	def test_post_bulk_edit_should_not_redirect_back_using_the_back_url_parameter_off_the_host
		1088	@request.session[:user_id] = 2
		1089	post :bulk_edit, :ids => [1,2], :back_url => 'http://google.com'
		1090
		1091	assert_response :redirect
		1092	assert_redirected_to :controller => 'issues', :action => 'index', :project_id => Project.find(1).identifier
		1093	end
		1094
1049	def test_move_routing	1095	def test_move_routing
1050	assert_routing(	1096	assert_routing(
1051	{:method => :get, :path => '/issues/1/move'},	1097	{: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