Project

General

Profile

Defect #37072 » 37072.patch

Go MAEDA, 2024-10-20 17:47

View differences:

app/models/query.rb
591 591
  def project_values
592 592
    project_values = []
593 593
    if User.current.logged?
594
      project_values << ["<< #{l(:label_my_projects).downcase} >>", "mine"] if User.current.memberships.any?
595
      project_values << ["<< #{l(:label_my_bookmarks).downcase} >>", "bookmarks"] if User.current.bookmarked_project_ids.any?
594
      project_values << ["<< #{l(:label_my_projects).downcase.upcase_first} >>", "mine"] if User.current.memberships.any?
595
      project_values << ["<< #{l(:label_my_bookmarks).downcase.upcase_first} >>", "bookmarks"] if User.current.bookmarked_project_ids.any?
596 596
    end
597 597
    project_values += all_projects_values
598 598
    project_values
app/views/calendars/show.html.erb
38 38
  <%= link_to_function sprite_icon('checked', l(:button_apply)), '$("#query_form").submit()', :class => 'icon icon-checked' %>
39 39
  <%= link_to sprite_icon('reload', l(:button_clear)), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
40 40
  <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
41
    <%= link_to_function sprite_icon('save', l(:button_save_object, object_name: l(:label_query).downcase)),
41
    <%= link_to_function sprite_icon('save', l(:button_save_object, object_name: l(:label_query).downcase).upcase_first),
42 42
                         "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
43 43
                         :class => 'icon icon-save' %>
44 44
  <% end %>
45 45
  <% if !@query.new_record? && @query.editable_by?(User.current) %>
46
    <%= link_to sprite_icon('edit', l(:button_edit_object, object_name: l(:label_query).downcase)), edit_query_path(@query, :calendar => 1), :class => 'icon icon-edit' %>
47
    <%= delete_link query_path(@query, :calendar => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
46
    <%= link_to sprite_icon('edit', l(:button_edit_object, object_name: l(:label_query).downcase).upcase_first), edit_query_path(@query, :calendar => 1), :class => 'icon icon-edit' %>
47
    <%= delete_link query_path(@query, :calendar => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase).upcase_first %>
48 48
  <% end %>
49 49
</p>
50 50
</div>
app/views/context_menus/issues.html.erb
164 164
  <li><%= context_menu_link sprite_icon('copy', l(:button_copy)), bulk_edit_issues_path(:ids => @issue_ids, :copy => '1'),
165 165
                            :class => 'icon icon-copy', :disabled => !@can[:copy] %></li>
166 166
<% end %>
167
  <li><%= context_menu_link sprite_icon('del', 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),
167
  <li><%= context_menu_link sprite_icon('del', l(:button_delete_object, object_name: (@issue_ids.size > 1 ? l(:label_issue_plural) : l(:label_issue)).downcase).upcase_first), issues_path(:ids => @issue_ids, :back_url => @back),
168 168
                            :method => :delete, :data => {:confirm => issues_destroy_confirmation_message(@issues)}, :class => 'icon icon-del', :disabled => !@can[:delete] %></li>
169 169

  
170 170
  <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>
app/views/gantts/show.html.erb
94 94
  <%= link_to sprite_icon('reload', l(:button_clear)), { :project_id => @project, :set_filter => 1 },
95 95
              :class => 'icon icon-reload' %>
96 96
  <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
97
    <%= link_to_function sprite_icon('save', l(:button_save_object, object_name: l(:label_query).downcase)),
97
    <%= link_to_function sprite_icon('save', l(:button_save_object, object_name: l(:label_query).downcase).upcase_first),
98 98
                         "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
99 99
                         :class => 'icon icon-save' %>
100 100
  <% end %>
101 101
<% if !@query.new_record? && @query.editable_by?(User.current) %>
102
  <%= link_to sprite_icon('edit', l(:button_edit_object, object_name: l(:label_query).downcase)), edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
103
  <%= delete_link query_path(@query, :gantt => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
102
  <%= link_to sprite_icon('edit', l(:button_edit_object, object_name: l(:label_query).downcase).upcase_first), edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
103
  <%= delete_link query_path(@query, :gantt => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase).upcase_first %>
104 104
<% end %>
105 105
</p>
106 106
</div>
app/views/issues/_action_menu.html.erb
9 9
            :class => 'icon icon-copy ' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %>
10 10
<%= actions_dropdown do %>
11 11
  <%= copy_object_url_link(issue_url(@issue, only_path: false)) %>
12
  <%= link_to sprite_icon('del', l(:button_delete_object, object_name: l(:label_issue).downcase)), issue_path(@issue),
12
  <%= link_to sprite_icon('del', l(:button_delete_object, object_name: l(:label_issue).downcase).upcase_first), issue_path(@issue),
13 13
              :data => {:confirm => issues_destroy_confirmation_message(@issue)},
14 14
              :method => :delete, :class => 'icon icon-del ' if @issue.deletable? %>
15 15
<% end %>
app/views/queries/_query_form.html.erb
63 63
  <%= link_to sprite_icon('reload', l(:button_clear)), { :set_filter => 1, :sort => '', :project_id => @project }, :class => 'icon icon-reload'  %>
64 64
  <% if @query.new_record? %>
65 65
    <% if User.current.allowed_to?(:save_queries, @project, :global => true) %>
66
      <%= link_to_function sprite_icon('save', l(:button_save_object, object_name: l(:label_query).downcase)),
66
      <%= link_to_function sprite_icon('save', l(:button_save_object, object_name: l(:label_query).downcase).upcase_first),
67 67
                           "$('#query_type').prop('disabled',false);$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit()",
68 68
                           :class => 'icon icon-save' %>
69 69
    <% end %>
70 70
  <% else %>
71 71
    <% if @query.editable_by?(User.current) %>
72 72
      <% redirect_params = (controller_name == 'admin' && action_name == 'projects') ? {:admin_projects => 1} : {} %>
73
      <%= link_to sprite_icon('edit', l(:button_edit_object, object_name: l(:label_query).downcase)), edit_query_path(@query, redirect_params), :class => 'icon icon-edit' %>
74
      <%= delete_link query_path(@query, redirect_params), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
73
      <%= link_to sprite_icon('edit', l(:button_edit_object, object_name: l(:label_query).downcase).upcase_first), edit_query_path(@query, redirect_params), :class => 'icon icon-edit' %>
74
      <%= delete_link query_path(@query, redirect_params), {}, l(:button_delete_object, object_name: l(:label_query).downcase).upcase_first %>
75 75
    <% end %>
76 76
  <% end %>
77 77
</p>
(5-5/5)