| <%= l(:label_version) %> | <%= l(:field_default_version) %> | <%= l(:field_effective_date) %> | @@ -33,7 +41,13 @@|||
|---|---|---|---|---|---|
| <%= link_to_version version %> | <%= checked_image(version.id == @project.default_version_id) %> | <%= format_date(version.effective_date) %> | @@ -42,7 +56,7 @@<%=h format_version_sharing(version.sharing) %> | <%= link_to_if_authorized(version.wiki_page_title, {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> | - <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> + <% if is_manage_version %> <%= link_to l(:button_edit), edit_version_path(version), :class => 'icon icon-edit' %> <%= delete_link version_path(version) %> <% end %> @@ -51,6 +65,7 @@ <% end %> |
<%= l(:label_no_data) %>
<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 8fd84ff13d..17fd4bdcb9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1288,6 +1288,7 @@ en: text_no_subject: no subject text_allowed_queries_to_select: Public (to any users) queries only selectable text_setting_config_change: You can configure the behaviour in config/configuration.yml. Please restart the application after editing it. + text_versions_destroy_confirmation: 'Are you sure you want to delete the selected version(s)?' default_role_manager: Manager default_role_developer: Developer diff --git a/config/routes.rb b/config/routes.rb index efb6db8e1e..b92c8f4755 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -233,8 +233,13 @@ Rails.application.routes.draw do match '/news/:id/comments', :to => 'comments#create', :via => :post match '/news/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete + match '/versions/context_menu', :to => 'context_menus#versions', :as => :versions_context_menu, :via => [:get, :post] + delete '/versions', :to => 'versions#destroy' resources :versions, :only => [:show, :edit, :update, :destroy] do post 'status_by', :on => :member + collection do + patch 'bulk_update' + end end resources :documents, :only => [:show, :edit, :update, :destroy] do diff --git a/lib/redmine.rb b/lib/redmine.rb index 5721667d81..aab16bf2c1 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -94,7 +94,7 @@ Redmine::AccessControl.map do |map| map.permission :select_project_modules, {:projects => :modules}, :require => :member map.permission :view_members, {:members => [:index, :show]}, :public => true, :read => true map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :new, :create, :edit, :update, :destroy, :autocomplete]}, :require => :member - map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member + map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy, :bulk_update]}, :require => :member map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member # Queries map.permission :manage_public_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :member diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb index ccbc4dfba3..3ddcabe3ea 100644 --- a/test/functional/context_menus_controller_test.rb +++ b/test/functional/context_menus_controller_test.rb @@ -470,4 +470,54 @@ class ContextMenusControllerTest < Redmine::ControllerTest assert_select 'a.disabled', :text => 'Edit' end + + def test_context_menu_one_version_should_link_to_version_path + @request.session[:user_id] = 2 + get( + :versions, + :params => { + :ids => [2] + } + ) + assert_response :success + + assert_select 'a.icon-edit[href=?]', '/versions/2/edit', :text => 'Edit' + assert_select 'a.icon-del[href=?]', '/versions?ids%5B%5D=2', :text => 'Delete' + + # Statuses + assert_select 'a[href=?][data-method="patch"]', '/versions/2?ids%5B%5D=2&version%5Bstatus%5D=open', :text => 'open' + assert_select 'a.icon-checked.disabled[href=?]', '#', :text => 'locked' + assert_select 'a[href=?][data-method="patch"]', '/versions/2?ids%5B%5D=2&version%5Bstatus%5D=closed', :text => 'closed' + # Sharings + assert_select 'a.icon-checked.disabled[href=?]', '#', :text => 'Not shared' + assert_select 'a[href=?][data-method="patch"]', '/versions/2?ids%5B%5D=2&version%5Bsharing%5D=descendants', :text => 'With subprojects' + assert_select 'a[href=?][data-method="patch"]', '/versions/2?ids%5B%5D=2&version%5Bsharing%5D=hierarchy', :text => 'With project hierarchy' + assert_select 'a[href=?][data-method="patch"]', '/versions/2?ids%5B%5D=2&version%5Bsharing%5D=tree', :text => 'With project tree' + assert_select 'a[href=?][data-method="patch"]', '/versions/2?ids%5B%5D=2&version%5Bsharing%5D=system', :text => 'With all projects' + end + + def test_context_menu_multiple_versions_should_link_to_bulk_update_versions_path + @request.session[:user_id] = 2 + get( + :versions, + :params => { + :ids => [2, 3] + } + ) + assert_response :success + + assert_select 'a.icon-edit', :text => 'Edit', :count => 0 + assert_select 'a.icon-del[href=?]', '/versions?ids%5B%5D=2&ids%5B%5D=3', :text => 'Delete' + + # Statuses + assert_select 'a[href=?][data-method="patch"]', '/versions/bulk_update?ids%5B%5D=2&ids%5B%5D=3&version%5Bstatus%5D=open', :text => 'open' + assert_select 'a[href=?][data-method="patch"]', '/versions/bulk_update?ids%5B%5D=2&ids%5B%5D=3&version%5Bstatus%5D=locked', :text => 'locked' + assert_select 'a[href=?][data-method="patch"]', '/versions/bulk_update?ids%5B%5D=2&ids%5B%5D=3&version%5Bstatus%5D=closed', :text => 'closed' + # Sharings + assert_select 'a[href=?][data-method="patch"]', '/versions/bulk_update?ids%5B%5D=2&ids%5B%5D=3&version%5Bsharing%5D=none', :text => 'Not shared' + assert_select 'a[href=?][data-method="patch"]', '/versions/bulk_update?ids%5B%5D=2&ids%5B%5D=3&version%5Bsharing%5D=descendants', :text => 'With subprojects' + assert_select 'a[href=?][data-method="patch"]', '/versions/bulk_update?ids%5B%5D=2&ids%5B%5D=3&version%5Bsharing%5D=hierarchy', :text => 'With project hierarchy' + assert_select 'a[href=?][data-method="patch"]', '/versions/bulk_update?ids%5B%5D=2&ids%5B%5D=3&version%5Bsharing%5D=tree', :text => 'With project tree' + assert_select 'a[href=?][data-method="patch"]', '/versions/bulk_update?ids%5B%5D=2&ids%5B%5D=3&version%5Bsharing%5D=system', :text => 'With all projects' + end end diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index f7d2dee265..af7bacbe91 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -867,6 +867,52 @@ class ProjectsControllerTest < Redmine::ControllerTest end end + def test_versions_in_settings_should_show_context_menu + @request.session[:user_id] = 2 + get( + :settings, + :params => { + :id => 'ecookbook', + :tab => 'versions', + :version_status => '', + :version_name => '.1', + } + ) + assert_response :success + assert_select 'table.versions' do + assert_select 'thead' do + assert_select 'th.checkbox input[type=checkbox][name=?]', 'check_all', 1 + end + assert_select 'tbody tr.hascontextmenu' do + assert_select 'td.checkbox input[type=checkbox][name=?]', 'ids[]', 1 + assert_select 'td.name', :text => '0.1' + end + end + end + + def test_versions_in_settings_with_version_shared_by_other_project_should_not_show_context_menu + @request.session[:user_id] = 2 + get( + :settings, + :params => { + :id => 'ecookbook', + :tab => 'versions', + :version_status => '', + :version_name => 'subproject', + } + ) + assert_response :success + assert_select 'table.versions' do + assert_select 'thead' do + assert_select 'th.checkbox input[type=checkbox][name=?]', 'check_all', 0 + end + assert_select 'tbody tr.shared' do + assert_select 'td.checkbox input[type=checkbox][name=?]', 'ids[]', 0 + assert_select 'td.name', :text => 'Private child of eCookbook - Private Version of public subproject' + end + end + end + def test_settings_should_show_locked_members user = User.generate! member = User.add_to_project(user, Project.find(1)) diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb index 3691f71f5f..024a715c3f 100644 --- a/test/functional/versions_controller_test.rb +++ b/test/functional/versions_controller_test.rb @@ -348,4 +348,78 @@ class VersionsControllerTest < Redmine::ControllerTest assert_include 'Assigned', response.body assert_include 'Closed', response.body end + + def test_bulk_update_on_status + ids = [2, 3] + update_attr = {:status => 'closed'} + assert_equal 2, Version.where(:id => ids).where.not(update_attr).count + + @request.session[:user_id] = 2 + patch :bulk_update, :params => { + :ids => ids, + :version => update_attr + } + assert_redirected_to :controller => :projects, :action => :settings, + :tab => :versions, :id => :ecookbook + assert_equal 'Successful update.', flash[:notice] + + assert_equal 2, Version.where(:id => ids).where(update_attr).count + end + + def test_bulk_update_on_sharing + ids = [2, 3] + update_attr = {:sharing => 'descendants'} + assert_equal 2, Version.where(:id => ids).where.not(update_attr).count + + @request.session[:user_id] = 2 + patch :bulk_update, :params => { + :ids => ids, + :version => update_attr + } + assert_redirected_to :controller => :projects, :action => :settings, + :tab => :versions, :id => :ecookbook + assert_equal 'Successful update.', flash[:notice] + + assert_equal 2, Version.where(:id => ids).where(update_attr).count + end + + def test_bulk_update_with_validation_failure + ids = [2, 3] + versions = Version.where(:id => ids).reorder(:id => :asc) + assert_equal 2, versions.count + + @request.session[:user_id] = 2 + patch :bulk_update, :params => { + :ids => ids, + :version => { + :status => 'invalid' + } + } + assert_redirected_to :controller => :projects, :action => :settings, + :tab => :versions, :id => :ecookbook + assert_equal 'Status is not included in the list', flash[:error] + + assert_equal versions, Version.where(:id => ids).reorder(:id => :asc) + end + + def test_bulk_destroy + Issue.update(:fixed_version_id => nil) + @request.session[:user_id] = 2 + assert_difference 'Version.count', -2 do + delete :destroy, :params => {:ids => [2, 3]} + end + assert_redirected_to :controller => :projects, :action => :settings, + :tab => :versions, :id => :ecookbook + assert_equal 'Successful deletion.', flash[:notice] + end + + def test_bulk_destroy_with_version_in_use_should_fail + @request.session[:user_id] = 2 + assert_no_difference 'Version.count' do + delete :destroy, :params => {:ids => [2, 3]} + end + assert_redirected_to :controller => :projects, :action => :settings, + :tab => :versions, :id => :ecookbook + assert_equal 'Unable to delete version.', flash[:error] + end end diff --git a/test/helpers/routes_helper_test.rb b/test/helpers/routes_helper_test.rb index 9f1ac7280b..fc87b8704c 100644 --- a/test/helpers/routes_helper_test.rb +++ b/test/helpers/routes_helper_test.rb @@ -20,7 +20,7 @@ require File.expand_path('../../test_helper', __FILE__) class RoutesHelperTest < Redmine::HelperTest - fixtures :projects, :issues + fixtures :projects, :issues, :versions include Rails.application.routes.url_helpers @@ -47,4 +47,9 @@ class RoutesHelperTest < Redmine::HelperTest assert_equal 'http://test.host/projects/ecookbook/issues?set_filter=1', _project_issues_url(Project.find(1), set_filter: 1) assert_equal 'http://test.host/issues?set_filter=1', _project_issues_url(nil, set_filter: 1) end + + def test_bulk_update_versions_path + assert_equal '/versions/bulk_update', _bulk_update_versions_path(nil, nil) + assert_equal '/versions/1', _bulk_update_versions_path(Version.find(1), nil) + end end diff --git a/test/integration/routing/context_menus_test.rb b/test/integration/routing/context_menus_test.rb index 8750e07176..895fa32efb 100644 --- a/test/integration/routing/context_menus_test.rb +++ b/test/integration/routing/context_menus_test.rb @@ -29,4 +29,9 @@ class RoutingContextMenusTest < Redmine::RoutingTest should_route 'GET /issues/context_menu' => 'context_menus#issues' should_route 'POST /issues/context_menu' => 'context_menus#issues' end + + def test_context_menus_versions + should_route 'GET /versions/context_menu' => 'context_menus#versions' + should_route 'POST /versions/context_menu' => 'context_menus#versions' + end end diff --git a/test/integration/routing/versions_test.rb b/test/integration/routing/versions_test.rb index cf5be2981c..b24e00b025 100644 --- a/test/integration/routing/versions_test.rb +++ b/test/integration/routing/versions_test.rb @@ -35,4 +35,9 @@ class RoutingVersionsTest < Redmine::RoutingTest should_route 'POST /versions/1/status_by' => 'versions#status_by', :id => '1' end + + def test_versions_bulk_edit + should_route 'PATCH /versions/bulk_update' => 'versions#bulk_update' + should_route 'DELETE /versions' => 'versions#destroy' + end end