diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2025-03-09 23:25:12 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2025-03-09 23:25:12 +0000 |
| commit | 1f46b0b236498de3cdcff4455ebb159edcd41450 (patch) | |
| tree | ec4d830b2e5c4d7c7c1eedaf3122d60df11a0bac /app/views/queries | |
| parent | 3c5f0af44d711c356b4143cfe37f9b7091df0c67 (diff) | |
| download | redmine-1f46b0b236498de3cdcff4455ebb159edcd41450.tar.gz redmine-1f46b0b236498de3cdcff4455ebb159edcd41450.zip | |
Extract project query for admins to a separate ProjectAdminQuery model (#42352).
Patch by Holger Just (user:hjust).
git-svn-id: https://svn.redmine.org/redmine/trunk@23531 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/queries')
| -rw-r--r-- | app/views/queries/_form.html.erb | 5 | ||||
| -rw-r--r-- | app/views/queries/_query_form.html.erb | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb index 213fb4890..b70ef53df 100644 --- a/app/views/queries/_form.html.erb +++ b/app/views/queries/_form.html.erb @@ -4,7 +4,6 @@ <div class="tabular"> <%= hidden_field_tag 'gantt', '1' if params[:gantt] %> <%= hidden_field_tag 'calendar', '1' if params[:calendar] %> -<%= hidden_field_tag 'admin_projects', '1' if params[:admin_projects] %> <p> <label for="query_name"> @@ -21,7 +20,7 @@ <p><label><%=l(:field_visible)%></label> <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PRIVATE %> <%= l(:label_visibility_private) %></label> <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PUBLIC %> <%= l(:label_visibility_public) %></label> - <% unless @query.type == 'ProjectQuery' %> + <% unless @query.is_a?(ProjectQuery) %> <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_ROLES %> <%= l(:label_visibility_roles) %>:</label> <% Role.givable.sorted.each do |role| %> <label class="block role-visibility"><%= check_box_tag 'query[role_ids][]', role.id, @query.roles.include?(role), :id => nil %> <%= role.name %></label> @@ -31,7 +30,7 @@ </p> <% end %> -<% unless @query.type == 'ProjectQuery' %> +<% unless @query.is_a?(ProjectQuery) %> <p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label> <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?, :class => (User.current.admin? ? '' : 'disable-unless-private') %></p> <% end %> diff --git a/app/views/queries/_query_form.html.erb b/app/views/queries/_query_form.html.erb index 68bc483a4..d04cd290e 100644 --- a/app/views/queries/_query_form.html.erb +++ b/app/views/queries/_query_form.html.erb @@ -69,9 +69,8 @@ <% end %> <% else %> <% if @query.editable_by?(User.current) %> - <% redirect_params = (controller_name == 'admin' && action_name == 'projects') ? {:admin_projects => 1} : {} %> - <%= link_to sprite_icon('edit', l(:button_edit_object, object_name: l(:label_query)).capitalize), edit_query_path(@query, redirect_params), :class => 'icon icon-edit' %> - <%= delete_link query_path(@query, redirect_params), {}, l(:button_delete_object, object_name: l(:label_query)).capitalize %> + <%= link_to sprite_icon('edit', l(:button_edit_object, object_name: l(:label_query)).capitalize), edit_query_path(@query), :class => 'icon icon-edit' %> + <%= delete_link query_path(@query), {}, l(:button_delete_object, object_name: l(:label_query)).capitalize %> <% end %> <% end %> </p> |