jro_apps/redmine Commit - r9778:23a1ef543fcf

Show shared versions when editing issues from different projects with the context menu (#11345)....

Jean-Philippe Lang -

r9778:23a1ef543fcf

parent child

Context file:

r9778:23a1ef543fcf

Collapse all files

app/controllers/context_menus_controller.rb +1 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class ContextMenusController < ApplicationController
               helper :watchers
               helper :issues
               def issues
                 @issues = Issue.visible.all(:conditions => {:id => params[:ids]}, :include => :project)
                 if (@issues.size == 1)
                   @issue = @issues.first
                 end
                 @allowed_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
                 @projects = @issues.collect(&:project).compact.uniq
                 @project = @projects.first if @projects.size == 1
                 @can = {:edit => User.current.allowed_to?(:edit_issues, @projects),
                         :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
                         :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)
                         }
                 if @project
                   if @issue
                     @assignables = @issue.assignable_users
                   else
                     @assignables = @project.assignable_users
                   end
                   @trackers = @project.trackers
                 else
                   #when multiple projects, we only keep the intersection of each set
                   @assignables = @projects.map(&:assignable_users).reduce(:&)
                   @trackers = @projects.map(&:trackers).reduce(:&)
                 end
+                @versions = @projects.map {|p| p.shared_versions.open}.reduce(:&)
                 @priorities = IssuePriority.active.reverse
                 @back = back_url
                 @options_by_custom_field = {}
                 if @can[:edit]
                   custom_fields = @issues.map(&:available_custom_fields).reduce(:&).select do |f|
                     %w(bool list user version).include?(f.field_format) && !f.multiple?
                   end
                   custom_fields.each do |field|
                     values = field.possible_values_options(@projects)
                     if values.any?
                       @options_by_custom_field[field] = values
                     end
                   end
                 end
                 @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
                 render :layout => false
               end
               def time_entries
                 @time_entries = TimeEntry.all(
                    :conditions => {:id => params[:ids]}, :include => :project)
                 @projects = @time_entries.collect(&:project).compact.uniq
                 @project = @projects.first if @projects.size == 1
                 @activities = TimeEntryActivity.shared.active
                 @can = {:edit   => User.current.allowed_to?(:edit_time_entries, @projects),
                         :delete => User.current.allowed_to?(:edit_time_entries, @projects)
                         }
                 @back = back_url
                 render :layout => false
               end
             end

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

             <ul>
               <%= call_hook(:view_issues_context_menu_start, {:issues => @issues, :can => @can, :back => @back }) %>
             <% if !@issue.nil? -%>
               <li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
                       :class => 'icon-edit', :disabled => !@can[:edit] %></li>
             <% else %>
               <li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id)},
                       :class => 'icon-edit', :disabled => !@can[:edit] %></li>
             <% end %>
               <% if @allowed_statuses.present? %>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_status) %></a>
                 <ul>
                 <% @allowed_statuses.each do |s| -%>
                     <li><%= context_menu_link h(s.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {:status_id => s}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && s == @issue.status), :disabled => !@can[:update] %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% unless @trackers.nil? %>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_tracker) %></a>
                 <ul>
                 <% @trackers.each do |t| -%>
                     <li><%= context_menu_link h(t.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'tracker_id' => t}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && t == @issue.tracker), :disabled => !@can[:edit] %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% if @safe_attributes.include?('priority_id') -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_priority) %></a>
                 <ul>
                 <% @priorities.each do |p| -%>
                     <li><%= context_menu_link h(p.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'priority_id' => p}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
-              <% #TODO: allow editing versions when multiple projects %>
+              <% if @safe_attributes.include?('fixed_version_id') && @versions.any? -%>
-              <% if @safe_attributes.include?('fixed_version_id') && @project && @project.shared_versions.open.any? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
                 <ul>
-                <% @project.shared_versions.open.sort.each do |v| -%>
+                <% @versions.sort.each do |v| -%>
                     <li><%= context_menu_link format_version_name(v), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'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_update', :ids => @issues.collect(&:id), :issue => {'fixed_version_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.fixed_version.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end %>
               <% if @safe_attributes.include?('assigned_to_id') && @assignables.present? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
                 <ul>
                 <% if @assignables.include?(User.current) %>
                     <li><%= context_menu_link "<< #{l(:label_me)} >>", {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => User.current}, :back_url => @back}, :method => :post,
                                               :disabled => !@can[:update] %></li>
                 <% end %>
                 <% @assignables.each do |u| -%>
                     <li><%= context_menu_link h(u.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'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_update', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.assigned_to.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end %>
               <% if @safe_attributes.include?('category_id') && @project && @project.issue_categories.any? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_category) %></a>
                 <ul>
                 <% @project.issue_categories.each do |u| -%>
                     <li><%= context_menu_link h(u.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'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_update', :ids => @issues.collect(&:id), :issue => {'category_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.category.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end -%>
               <% if @safe_attributes.include?('done_ratio') && Issue.use_field_for_done_ratio? %>
               <li class="folder">
                 <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_update', :ids => @issues.collect(&:id), :issue => {'done_ratio' => p}, :back_url => @back}, :method => :post,
                                                   :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% @options_by_custom_field.each do |field, options| %>
                 <li class="folder">
                   <a href="#" class="submenu"><%= h(field.name) %></a>
                   <ul>
                   <% options.each do |text, value| %>
                     <li><%= bulk_update_custom_field_context_menu_link(field, text, value || text) %></li>
                   <% end %>
                   <% unless field.is_required? %>
                     <li><%= bulk_update_custom_field_context_menu_link(field, l(:label_none), '') %></li>
                   <% end %>
                   </ul>
                 </li>
               <% end %>
             <% if !@issue.nil? %>
               <% if @can[:log_time] -%>
               <li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue},
                       :class => 'icon-time-add' %></li>
               <% end %>
               <% if User.current.logged? %>
               <li><%= watcher_link(@issue, User.current) %></li>
               <% end %>
             <% end %>
             <% if @issue.present? %>
               <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
                       :class => 'icon-copy', :disabled => !@can[:copy] %></li>
             <% else %>
               <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :copy => '1'},
                                       :class => 'icon-copy', :disabled => !@can[:move] %></li>
             <% end %>
               <li><%= context_menu_link l(:button_delete), issues_path(:ids => @issues.collect(&:id), :back_url => @back),
                                         :method => :delete, :data => {:confirm => issues_destroy_confirmation_message(@issues)}, :class => 'icon-del', :disabled => !@can[:delete] %></li>
               <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>
             </ul>

test/functional/context_menus_controller_test.rb +12 0

             require File.expand_path('../../test_helper', __FILE__)
             class ContextMenusControllerTest < ActionController::TestCase
               fixtures :projects,
                        :trackers,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :workflows,
                        :journals, :journal_details,
                        :versions,
                        :issues, :issue_statuses, :issue_categories,
                        :users,
                        :enumerations,
                        :time_entries
               def test_context_menu_one_issue
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Edit',
                                         :attributes => { :href => '/issues/1/edit',
                                                          :class => 'icon-edit' }
                 assert_tag :tag => 'a', :content => 'Closed',
                                         :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bstatus_id%5D=5',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Immediate',
                                         :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bpriority_id%5D=8',
                                                          :class => '' }
                 assert_no_tag :tag => 'a', :content => 'Inactive Priority'
                 # Versions
                 assert_tag :tag => 'a', :content => '2.0',
                                         :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bfixed_version_id%5D=3',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'eCookbook Subproject 1 - 2.0',
                                         :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bfixed_version_id%5D=4',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Dave Lopper',
                                         :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bassigned_to_id%5D=3',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Copy',
                                         :attributes => { :href => '/projects/ecookbook/issues/1/copy',
                                                          :class => 'icon-copy' }
                 assert_no_tag :tag => 'a', :content => 'Move'
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '/issues?ids%5B%5D=1',
                                                          :class => 'icon-del' }
               end
               def test_context_menu_one_issue_by_anonymous
                 get :issues, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '#',
                                                          :class => 'icon-del disabled' }
               end
               def test_context_menu_multiple_issues_of_same_project
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1, 2]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_not_nil assigns(:issues)
                 assert_equal [1, 2], assigns(:issues).map(&:id).sort
                 ids = assigns(:issues).map(&:id).map {|i| "ids%5B%5D=#{i}"}.join('&amp;')
                 assert_tag :tag => 'a', :content => 'Edit',
                                         :attributes => { :href => "/issues/bulk_edit?#{ids}",
                                                          :class => 'icon-edit' }
                 assert_tag :tag => 'a', :content => 'Closed',
                                         :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bstatus_id%5D=5",
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Immediate',
                                         :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bpriority_id%5D=8",
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Dave Lopper',
                                         :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bassigned_to_id%5D=3",
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Copy',
                                         :attributes => { :href => "/issues/bulk_edit?copy=1&amp;#{ids}",
                                                          :class => 'icon-copy' }
                 assert_no_tag :tag => 'a', :content => 'Move'
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => "/issues?#{ids}",
                                                          :class => 'icon-del' }
               end
               def test_context_menu_multiple_issues_of_different_projects
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1, 2, 6]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_not_nil assigns(:issues)
                 assert_equal [1, 2, 6], assigns(:issues).map(&:id).sort
                 ids = assigns(:issues).map(&:id).map {|i| "ids%5B%5D=#{i}"}.join('&amp;')
                 assert_tag :tag => 'a', :content => 'Edit',
                                         :attributes => { :href => "/issues/bulk_edit?#{ids}",
                                                          :class => 'icon-edit' }
                 assert_tag :tag => 'a', :content => 'Closed',
                                         :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bstatus_id%5D=5",
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Immediate',
                                         :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bpriority_id%5D=8",
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'John Smith',
                                         :attributes => { :href => "/issues/bulk_update?#{ids}&amp;issue%5Bassigned_to_id%5D=2",
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => "/issues?#{ids}",
                                                          :class => 'icon-del' }
               end
               def test_context_menu_should_include_list_custom_fields
                 field = IssueCustomField.create!(:name => 'List', :field_format => 'list',
                   :possible_values => ['Foo', 'Bar'], :is_for_all => true, :tracker_ids => [1, 2, 3])
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
                 assert_tag 'a',
                   :content => 'List',
                   :attributes => {:href => '#'},
                   :sibling => {:tag => 'ul', :children => {:count => 3}}
                 assert_tag 'a',
                   :content => 'Foo',
                   :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=Foo"}
                 assert_tag 'a',
                   :content => 'none',
                   :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D="}
               end
               def test_context_menu_should_not_include_null_value_for_required_custom_fields
                 field = IssueCustomField.create!(:name => 'List', :is_required => true, :field_format => 'list',
                   :possible_values => ['Foo', 'Bar'], :is_for_all => true, :tracker_ids => [1, 2, 3])
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1, 2]
                 assert_tag 'a',
                   :content => 'List',
                   :attributes => {:href => '#'},
                   :sibling => {:tag => 'ul', :children => {:count => 2}}
               end
               def test_context_menu_on_single_issue_should_select_current_custom_field_value
                 field = IssueCustomField.create!(:name => 'List', :field_format => 'list',
                   :possible_values => ['Foo', 'Bar'], :is_for_all => true, :tracker_ids => [1, 2, 3])
                 issue = Issue.find(1)
                 issue.custom_field_values = {field.id => 'Bar'}
                 issue.save!
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
                 assert_tag 'a',
                   :content => 'List',
                   :attributes => {:href => '#'},
                   :sibling => {:tag => 'ul', :children => {:count => 3}}
                 assert_tag 'a',
                   :content => 'Bar',
                   :attributes => {:class => /icon-checked/}
               end
               def test_context_menu_should_include_bool_custom_fields
                 field = IssueCustomField.create!(:name => 'Bool', :field_format => 'bool',
                   :is_for_all => true, :tracker_ids => [1, 2, 3])
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
                 assert_tag 'a',
                   :content => 'Bool',
                   :attributes => {:href => '#'},
                   :sibling => {:tag => 'ul', :children => {:count => 3}}
                 assert_tag 'a',
                   :content => 'Yes',
                   :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=1"}
               end
               def test_context_menu_should_include_user_custom_fields
                 field = IssueCustomField.create!(:name => 'User', :field_format => 'user',
                   :is_for_all => true, :tracker_ids => [1, 2, 3])
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
                 assert_tag 'a',
                   :content => 'User',
                   :attributes => {:href => '#'},
                   :sibling => {:tag => 'ul', :children => {:count => Project.find(1).members.count + 1}}
                 assert_tag 'a',
                   :content => 'John Smith',
                   :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=2"}
               end
               def test_context_menu_should_include_version_custom_fields
                 field = IssueCustomField.create!(:name => 'Version', :field_format => 'version', :is_for_all => true, :tracker_ids => [1, 2, 3])
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
                 assert_tag 'a',
                   :content => 'Version',
                   :attributes => {:href => '#'},
                   :sibling => {:tag => 'ul', :children => {:count => Project.find(1).shared_versions.count + 1}}
                 assert_tag 'a',
                   :content => '2.0',
                   :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=3"}
               end
               def test_context_menu_by_assignable_user_should_include_assigned_to_me_link
                 @request.session[:user_id] = 2
                 get :issues, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => / me /,
                                         :attributes => { :href => '/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bassigned_to_id%5D=2',
                                                          :class => '' }
               end
+              def test_context_menu_should_propose_shared_versions_for_issues_from_different_projects
+                @request.session[:user_id] = 2
+                version = Version.create!(:name => 'Shared', :sharing => 'system', :project_id => 1)
+                get :issues, :ids => [1, 4]
+                assert_response :success
+                assert_template 'context_menu'
+                assert_include version, assigns(:versions)
+                assert_tag :tag => 'a', :content => 'eCookbook - Shared'
+              end
               def test_context_menu_issue_visibility
                 get :issues, :ids => [1, 4]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_equal [1], assigns(:issues).collect(&:id)
               end
               def test_time_entries_context_menu
                 @request.session[:user_id] = 2
                 get :time_entries, :ids => [1, 2]
                 assert_response :success
                 assert_template 'time_entries'
                 assert_tag 'a', :content => 'Edit'
                 assert_no_tag 'a', :content => 'Edit', :attributes => {:class => /disabled/}
               end
               def test_time_entries_context_menu_without_edit_permission
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 get :time_entries, :ids => [1, 2]
                 assert_response :success
                 assert_template 'time_entries'
                 assert_tag 'a', :content => 'Edit', :attributes => {:class => /disabled/}
               end
             end

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