| @@ -30,7 +30,7 class QueriesController < ApplicationController | |||
|
|
30 | 30 | @query.project = @project |
|
|
31 | 31 | @query.user = logged_in_user |
|
|
32 | 32 | @query.executed_by = logged_in_user |
|
|
33 | @query.is_public = false unless current_role.allowed_to?(:manage_pulic_queries) | |
|
|
33 | @query.is_public = false unless current_role.allowed_to?(:manage_public_queries) | |
|
|
34 | 34 | |
|
|
35 | 35 | params[:fields].each do |field| |
|
|
36 | 36 | @query.add_filter(field, params[:operators][field], params[:values][field]) |
| @@ -51,7 +51,7 class QueriesController < ApplicationController | |||
|
|
51 | 51 | @query.add_filter(field, params[:operators][field], params[:values][field]) |
|
|
52 | 52 | end if params[:fields] |
|
|
53 | 53 | @query.attributes = params[:query] |
|
|
54 | @query.is_public = false unless current_role.allowed_to?(:manage_pulic_queries) | |
|
|
54 | @query.is_public = false unless current_role.allowed_to?(:manage_public_queries) | |
|
|
55 | 55 | |
|
|
56 | 56 | if @query.save |
|
|
57 | 57 | flash[:notice] = l(:notice_successful_update) |
| @@ -82,7 +82,7 class Query < ActiveRecord::Base | |||
|
|
82 | 82 | def editable_by?(user) |
|
|
83 | 83 | return false unless user |
|
|
84 | 84 | return true if !is_public && self.user_id == user.id |
|
|
85 | is_public && user.allowed_to?(:manage_pulic_queries, project) | |
|
|
85 | is_public && user.allowed_to?(:manage_public_queries, project) | |
|
|
86 | 86 | end |
|
|
87 | 87 | |
|
|
88 | 88 | def available_filters |
| @@ -5,7 +5,7 | |||
|
|
5 | 5 | <p><label for="query_name"><%=l(:field_name)%></label> |
|
|
6 | 6 | <%= text_field 'query', 'name', :size => 80 %></p> |
|
|
7 | 7 | |
|
|
8 | <% if current_role.allowed_to?(:manage_pulic_queries) %> | |
|
|
8 | <% if current_role.allowed_to?(:manage_public_queries) %> | |
|
|
9 | 9 | <p><label for="query_is_public"><%=l(:field_is_public)%></label> |
|
|
10 | 10 | <%= check_box 'query', 'is_public' %></p> |
|
|
11 | 11 | <% end %> |
| @@ -36,7 +36,7 Redmine::AccessControl.map do |map| | |||
|
|
36 | 36 | map.permission :move_issues, {:projects => :move_issues}, :require => :loggedin |
|
|
37 | 37 | map.permission :delete_issues, {:issues => :destroy}, :require => :member |
|
|
38 | 38 | # Queries |
|
|
39 | map.permission :manage_pulic_queries, {:queries => [:new, :edit, :destroy]}, :require => :member | |
|
|
39 | map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member | |
|
|
40 | 40 | map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin |
|
|
41 | 41 | # Gantt & calendar |
|
|
42 | 42 | map.permission :view_gantt, :projects => :gantt |
| @@ -62,7 +62,7 roles_001: | |||
|
|
62 | 62 | - :change_issue_status |
|
|
63 | 63 | - :move_issues |
|
|
64 | 64 | - :delete_issues |
|
|
65 | - :manage_pulic_queries | |
|
|
65 | - :manage_public_queries | |
|
|
66 | 66 | - :save_queries |
|
|
67 | 67 | - :view_gantt |
|
|
68 | 68 | - :view_calendar |
| @@ -100,7 +100,7 roles_002: | |||
|
|
100 | 100 | - :change_issue_status |
|
|
101 | 101 | - :move_issues |
|
|
102 | 102 | - :delete_issues |
|
|
103 | - :manage_pulic_queries | |
|
|
103 | - :manage_public_queries | |
|
|
104 | 104 | - :save_queries |
|
|
105 | 105 | - :view_gantt |
|
|
106 | 106 | - :view_calendar |
| @@ -138,7 +138,7 roles_003: | |||
|
|
138 | 138 | - :change_issue_status |
|
|
139 | 139 | - :move_issues |
|
|
140 | 140 | - :delete_issues |
|
|
141 | - :manage_pulic_queries | |
|
|
141 | - :manage_public_queries | |
|
|
142 | 142 | - :save_queries |
|
|
143 | 143 | - :view_gantt |
|
|
144 | 144 | - :view_calendar |
General Comments 0
You need to be logged in to leave comments.
Login now