Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-03 03:46:19 +01:00
Code Issues Packages Projects Releases Activity

Fixed that time entry queries cannot be saved when issue tracking is disabled (#14790).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16718 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-06-26 19:30:36 +00:00
parent 9fbf4de653
commit f3523f25fd
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/redmine.rb
View File

@@ -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_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]}, :require => :member
map.permission :add_subprojects, {:projects => [:new, :create]}, :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| map.project_module :issue_tracking do |map|
# Issues # Issues
@@ -110,9 +113,6 @@ Redmine::AccessControl.map do |map|
map.permission :view_private_notes, {}, :read => true, :require => :member map.permission :view_private_notes, {}, :read => true, :require => :member
map.permission :set_notes_private, {}, :require => :member map.permission :set_notes_private, {}, :require => :member
map.permission :delete_issues, {:issues => :destroy}, :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 # Watchers
map.permission :view_issue_watchers, {}, :read => true map.permission :view_issue_watchers, {}, :read => true
map.permission :add_issue_watchers, {:watchers => [:new, :create, :append, :autocomplete_for_user]} map.permission :add_issue_watchers, {:watchers => [:new, :create, :append, :autocomplete_for_user]}

11
test/functional/queries_controller_test.rb
View File

@@ -77,6 +77,17 @@ class QueriesControllerTest < Redmine::ControllerTest
assert_select 'input[name=type][value=?]', 'TimeEntryQuery' assert_select 'input[name=type][value=?]', 'TimeEntryQuery'
end 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 def test_create_project_public_query
@request.session[:user_id] = 2 @request.session[:user_id] = 2
post :create, :params => { post :create, :params => {