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

Merged r23193 from 5.1-stable to 5.0-stable (#37072).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@23194 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2024-11-03 13:29:12 +00:00
parent cac079158f
commit 39df88ae20
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/calendars/show.html.erb
View File

@@ -28,13 +28,13 @@
<%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
<% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
<%= link_to_function l(:button_save_object, object_name: l(:label_query).downcase),
<%= link_to_function l(:button_save_object, object_name: l(:label_query)).capitalize,
"$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
:class => 'icon icon-save' %>
<% end %>
<% if !@query.new_record? && @query.editable_by?(User.current) %>
<%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, :calendar => 1), :class => 'icon icon-edit' %>
<%= delete_link query_path(@query, :calendar => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
<%= link_to l(:button_edit_object, object_name: l(:label_query)).capitalize, edit_query_path(@query, :calendar => 1), :class => 'icon icon-edit' %>
<%= delete_link query_path(@query, :calendar => 1), {}, l(:button_delete_object, object_name: l(:label_query)).capitalize %>
<% end %>
</p>
</div>

2
app/views/context_menus/issues.html.erb
View File

@@ -164,7 +164,7 @@
<li><%= context_menu_link l(:button_copy), bulk_edit_issues_path(:ids => @issue_ids, :copy => '1'),
:class => 'icon icon-copy', :disabled => !@can[:copy] %></li>
<% end %>
<li><%= context_menu_link l(:button_delete_object, object_name: (@issue_ids.size > 1 ? l(:label_issue_plural) : l(:label_issue)).downcase), issues_path(:ids => @issue_ids, :back_url => @back),
<li><%= context_menu_link l(:button_delete_object, object_name: (@issue_ids.size > 1 ? l(:label_issue_plural) : l(:label_issue))).capitalize, issues_path(:ids => @issue_ids, :back_url => @back),
:method => :delete, :data => {:confirm => issues_destroy_confirmation_message(@issues)}, :class => 'icon icon-del', :disabled => !@can[:delete] %></li>
<%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>

8
app/views/gantts/show.html.erb
View File

@@ -91,13 +91,13 @@
<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
:class => 'icon icon-reload' %>
<% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
<%= link_to_function l(:button_save_object, object_name: l(:label_query).downcase),
<%= link_to_function l(:button_save_object, object_name: l(:label_query)).capitalize,
"$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
:class => 'icon icon-save' %>
<% end %>
<% if !@query.new_record? && @query.editable_by?(User.current) %>
<%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
<%= delete_link query_path(@query, :gantt => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
<%= link_to l(:button_edit_object, object_name: l(:label_query)).capitalize, edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
<%= delete_link query_path(@query, :gantt => 1), {}, l(:button_delete_object, object_name: l(:label_query)).capitalize %>
<% end %>
</p>
</div>
@@ -119,7 +119,7 @@
if @gantt.zoom > 1
show_weeks = true
headers_height = 2 * header_height
headers_height = 2 * header_height˚˚˚KK
if @gantt.zoom > 2
show_days = true
headers_height = 3 * header_height

2
app/views/issues/_action_menu.html.erb
View File

@@ -9,7 +9,7 @@
:class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %>
<%= actions_dropdown do %>
<%= copy_object_url_link(issue_url(@issue, only_path: false)) %>
<%= link_to l(:button_delete_object, object_name: l(:label_issue).downcase), issue_path(@issue),
<%= link_to l(:button_delete_object, object_name: l(:label_issue)).capitalize, issue_path(@issue),
:data => {:confirm => issues_destroy_confirmation_message(@issue)},
:method => :delete, :class => 'icon icon-del' if @issue.deletable? %>
<% end %>

6
app/views/queries/_query_form.html.erb
View File

@@ -57,14 +57,14 @@
<%= link_to l(:button_clear), { :set_filter => 1, :sort => '', :project_id => @project }, :class => 'icon icon-reload' %>
<% if @query.new_record? %>
<% if User.current.allowed_to?(:save_queries, @project, :global => true) %>
<%= link_to_function l(:button_save_object, object_name: l(:label_query).downcase),
<%= link_to_function l(:button_save_object, object_name: l(:label_query)).capitalize,
"$('#query_type').prop('disabled',false);$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit()",
:class => 'icon icon-save' %>
<% end %>
<% else %>
<% if @query.editable_by?(User.current) %>
<%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query), :class => 'icon icon-edit' %>
<%= delete_link query_path(@query), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
<%= link_to 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>