diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-06-26 19:30:36 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-06-26 19:30:36 +0000 |
| commit | f3523f25fd9714c462076ce202d5d6d09e192c26 (patch) | |
| tree | 2b331841ccf3598cb1526718322b076932dbbf03 | |
| parent | 9fbf4de6534b36b8ddc8c1baa8279f3b619178e6 (diff) | |
| download | redmine-f3523f25fd9714c462076ce202d5d6d09e192c26.tar.gz redmine-f3523f25fd9714c462076ce202d5d6d09e192c26.zip | |
Fixed that time entry queries cannot be saved when issue tracking is disabled (#14790).
git-svn-id: http://svn.redmine.org/redmine/trunk@16718 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine.rb | 6 | ||||
| -rw-r--r-- | test/functional/queries_controller_test.rb | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/redmine.rb b/lib/redmine.rb index cd706bae8..6f4d3e07c 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -86,6 +86,9 @@ Redmine::AccessControl.map do |map| 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 :add_subprojects, {:projects => [:new, :create]}, :require => :member + # Queries + map.permission :manage_public_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :member + map.permission :save_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :loggedin map.project_module :issue_tracking do |map| # Issues @@ -110,9 +113,6 @@ Redmine::AccessControl.map do |map| map.permission :view_private_notes, {}, :read => true, :require => :member map.permission :set_notes_private, {}, :require => :member map.permission :delete_issues, {:issues => :destroy}, :require => :member - # Queries - map.permission :manage_public_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :member - map.permission :save_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :loggedin # Watchers map.permission :view_issue_watchers, {}, :read => true map.permission :add_issue_watchers, {:watchers => [:new, :create, :append, :autocomplete_for_user]} diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb index 03fb7bef1..4aac31540 100644 --- a/test/functional/queries_controller_test.rb +++ b/test/functional/queries_controller_test.rb @@ -77,6 +77,17 @@ class QueriesControllerTest < Redmine::ControllerTest assert_select 'input[name=type][value=?]', 'TimeEntryQuery' end + def test_new_time_entry_query_with_issue_tracking_module_disabled_should_be_allowed + Project.find(1).disable_module! :issue_tracking + + @request.session[:user_id] = 2 + get :new, :params => { + :project_id => 1, + :type => 'TimeEntryQuery' + } + assert_response :success + end + def test_create_project_public_query @request.session[:user_id] = 2 post :create, :params => { |