jro_apps/redmine Commit - r4128:156eca4d223e

Added ability to edit issues from different project through contextual menu (#5332)...

Jean-Baptiste Barth -

r4128:156eca4d223e

parent child

Context file:

r4128:156eca4d223e

Collapse all files

app/controllers/context_menus_controller.rb +6 -2

                 @projects = @issues.collect(&:project).compact.uniq
                 @project = @projects.first if @projects.size == 1
-                @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
+                @can = {:edit => User.current.allowed_to?(:edit_issues, @projects),
                         :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
-                        :update => (@project && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && @allowed_statuses && !@allowed_statuses.empty?))),
+                        :update => (User.current.allowed_to?(:edit_issues, @projects) || (User.current.allowed_to?(:change_status, @projects) && !@allowed_statuses.blank?)),
                         :move => (@project && User.current.allowed_to?(:move_issues, @project)),
                         :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
                         :delete => User.current.allowed_to?(:delete_issues, @projects)
                   @assignables = @project.assignable_users
                   @assignables << @issue.assigned_to if @issue && @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
                   @trackers = @project.trackers
+                else
+                  #when multiple projects, we only keep the intersection of each set
+                  @assignables = @projects.map(&:assignable_users).inject{|memo,a| memo & a}
+                  @trackers = @projects.map(&:trackers).inject{|memo,t| memo & t}
                 end
                 @priorities = IssuePriority.all.reverse

app/controllers/issues_controller.rb +5 -3

               before_filter :find_issue, :only => [:show, :edit, :update]
               before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :move, :perform_move, :destroy]
-              before_filter :check_project_uniqueness, :only => [:bulk_edit, :bulk_update, :move, :perform_move]
+              before_filter :check_project_uniqueness, :only => [:move, :perform_move]
               before_filter :find_project, :only => [:new, :create]
               before_filter :authorize, :except => [:index]
               before_filter :find_optional_project, :only => [:index]
               # Bulk edit a set of issues
               def bulk_edit
                 @issues.sort!
-                @available_statuses = Workflow.available_statuses(@project)
+                @available_statuses = @projects.map{|p|Workflow.available_statuses(p)}.inject{|memo,w|memo & w}
-                @custom_fields = @project.all_issue_custom_fields
+                @custom_fields = @projects.map{|p|p.all_issue_custom_fields}.inject{|memo,c|memo & c}
+                @assignables = @projects.map(&:assignable_users).inject{|memo,a| memo & a}
+                @trackers = @projects.map(&:trackers).inject{|memo,t| memo & t}
               end
               def bulk_update

app/views/context_menus/issues.html.erb +2 -3

             	</li>
             	<% end %>
-              <% if @projects.size == 1 %>
             	<li class="folder">
             		<a href="#" class="submenu"><%= l(:field_priority) %></a>
             		<ul>
             		<% end -%>
             		</ul>
             	</li>
-              <% end %>
+              <% #TODO: allow editing versions when multiple projects %>
             	<% unless @project.nil? || @project.shared_versions.open.empty? -%>
             	<li class="folder">
             		<a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
             	</li>
             	<% end -%>
-              <% if Issue.use_field_for_done_ratio? && @projects.size == 1 %>
+              <% if Issue.use_field_for_done_ratio? %>
             	<li class="folder">
             		<a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
             		<ul>

app/views/issues/bulk_edit.rhtml +7 -2

             <div class="splitcontentleft">
             <p>
             	<label><%= l(:field_tracker) %></label>
-            	<%= select_tag('issue[tracker_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@project.trackers, :id, :name)) %>
+            	<%= select_tag('issue[tracker_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@trackers, :id, :name)) %>
             </p>
             <% if @available_statuses.any? %>
             <p>
             	<label><%= l(:field_assigned_to) %></label>
             	<%= select_tag('issue[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                              content_tag('option', l(:label_nobody), :value => 'none') +
-                                             options_from_collection_for_select(@project.assignable_users, :id, :name)) %>
+                                             options_from_collection_for_select(@assignables, :id, :name)) %>
             </p>
+            <% if @project %>
             <p>
             	<label><%= l(:field_category) %></label>
             	<%= select_tag('issue[category_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                             content_tag('option', l(:label_none), :value => 'none') +
                                             options_from_collection_for_select(@project.issue_categories, :id, :name)) %>
             </p>
+            <% end %>
+            <% #TODO: allow editing versions when multiple projects %>
+            <% if @project %>
             <p>
             	<label><%= l(:field_fixed_version) %></label>
             	<%= select_tag('issue[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                                content_tag('option', l(:label_none), :value => 'none') +
                                                version_options_for_select(@project.shared_versions.open)) %>
             </p>
+            <% end %>
             <% @custom_fields.each do |custom_field| %>
             	<p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('issue', custom_field) %></p>

test/functional/context_menus_controller_test.rb +12 0

@@ -85,6 +85,18 class ContextMenusControllerTest < ActionController::TestCase
85	assert_response :success	85	assert_response :success
86	assert_template 'context_menu'	86	assert_template 'context_menu'
87	ids = "ids%5B%5D=1&ids%5B%5D=2&ids%5B%5D=6"	87	ids = "ids%5B%5D=1&ids%5B%5D=2&ids%5B%5D=6"
		88	assert_tag :tag => 'a', :content => 'Edit',
		89	:attributes => { :href => "/issues/bulk_edit?#{ids}",
		90	:class => 'icon-edit' }
		91	assert_tag :tag => 'a', :content => 'Closed',
		92	:attributes => { :href => "/issues/bulk_edit?#{ids}&issue%5Bstatus_id%5D=5",
		93	:class => '' }
		94	assert_tag :tag => 'a', :content => 'Immediate',
		95	:attributes => { :href => "/issues/bulk_edit?#{ids}&issue%5Bpriority_id%5D=8",
		96	:class => '' }
		97	assert_tag :tag => 'a', :content => 'John Smith',
		98	:attributes => { :href => "/issues/bulk_edit?#{ids}&issue%5Bassigned_to_id%5D=2",
		99	:class => '' }
88	assert_tag :tag => 'a', :content => 'Delete',	100	assert_tag :tag => 'a', :content => 'Delete',
89	:attributes => { :href => "/issues/destroy?#{ids}",	101	:attributes => { :href => "/issues/destroy?#{ids}",
90	:class => 'icon-del' }	102	:class => 'icon-del' }

test/functional/issues_controller_test.rb +46 0

@@ -911,6 +911,19 class IssuesControllerTest < ActionController::TestCase
911	assert_tag :select, :attributes => {:name => 'issue[custom_field_values][1]'}	911	assert_tag :select, :attributes => {:name => 'issue[custom_field_values][1]'}
912	end	912	end
913		913
		914	def test_get_bulk_edit_on_different_projects
		915	@request.session[:user_id] = 2
		916	get :bulk_edit, :ids => [1, 2, 6]
		917	assert_response :success
		918	assert_template 'bulk_edit'
		919
		920	# Project specific custom field, date type
		921	field = CustomField.find(9)
		922	assert !field.is_for_all?
		923	assert !field.project_ids.include?(Issue.find(6).project_id)
		924	assert_no_tag :input, :attributes => {:name => 'issue[custom_field_values][9]'}
		925	end
		926
914	def test_bulk_update	927	def test_bulk_update
915	@request.session[:user_id] = 2	928	@request.session[:user_id] = 2
916	# update issues priority	929	# update issues priority
@@ -930,6 +943,39 class IssuesControllerTest < ActionController::TestCase
930	assert_equal 1, journal.details.size	943	assert_equal 1, journal.details.size
931	end	944	end
932		945
		946	def test_bulk_update_on_different_projects
		947	@request.session[:user_id] = 2
		948	# update issues priority
		949	post :bulk_update, :ids => [1, 2, 6], :notes => 'Bulk editing',
		950	:issue => {:priority_id => 7,
		951	:assigned_to_id => '',
		952	:custom_field_values => {'2' => ''}}
		953
		954	assert_response 302
		955	# check that the issues were updated
		956	assert_equal [7, 7, 7], Issue.find([1,2,6]).map(&:priority_id)
		957
		958	issue = Issue.find(1)
		959	journal = issue.journals.find(:first, :order => 'created_on DESC')
		960	assert_equal '125', issue.custom_value_for(2).value
		961	assert_equal 'Bulk editing', journal.notes
		962	assert_equal 1, journal.details.size
		963	end
		964
		965	def test_bulk_update_on_different_projects_without_rights
		966	@request.session[:user_id] = 3
		967	user = User.find(3)
		968	action = { :controller => "issues", :action => "bulk_update" }
		969	assert user.allowed_to?(action, Issue.find(1).project)
		970	assert ! user.allowed_to?(action, Issue.find(6).project)
		971	post :bulk_update, :ids => [1, 6], :notes => 'Bulk should fail',
		972	:issue => {:priority_id => 7,
		973	:assigned_to_id => '',
		974	:custom_field_values => {'2' => ''}}
		975	assert_response 403
		976	assert_not_equal "Bulk should fail", Journal.last.notes
		977	end
		978
933	def test_bullk_update_should_send_a_notification	979	def test_bullk_update_should_send_a_notification
934	@request.session[:user_id] = 2	980	@request.session[:user_id] = 2
935	ActionMailer::Base.deliveries.clear	981	ActionMailer::Base.deliveries.clear

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