From f8c9efdb31af5f02b27a68d2aabc9e18380ae2f8 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 29 Oct 2011 01:14:47 +0000 Subject: [PATCH] [#9489] linked labels to their elements Contributed by Romano Licker. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7679 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issue_moves/new.html.erb | 10 +++++----- app/views/issues/bulk_edit.html.erb | 22 +++++++++++----------- app/views/issues/index.html.erb | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/views/issue_moves/new.html.erb b/app/views/issue_moves/new.html.erb index 962a71d6c..743647ee0 100644 --- a/app/views/issue_moves/new.html.erb +++ b/app/views/issue_moves/new.html.erb @@ -26,17 +26,17 @@ <%= select_tag "new_tracker_id", "" + options_from_collection_for_select(@trackers, "id", "name") %>

- + <%= select_tag('status_id', "" + options_from_collection_for_select(@available_statuses, :id, :name)) %>

- + <%= select_tag('priority_id', "" + options_from_collection_for_select(IssuePriority.active, :id, :name)) %>

- + <%= select_tag('assigned_to_id', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_nobody), :value => 'none') + principals_options_for_select(@target_project.assignable_users)) %> @@ -45,12 +45,12 @@

- + <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>

- + <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>

diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb index df04ec969..447b9cee4 100644 --- a/app/views/issues/bulk_edit.html.erb +++ b/app/views/issues/bulk_edit.html.erb @@ -10,28 +10,28 @@

- + <%= select_tag('issue[tracker_id]', "" + options_from_collection_for_select(@trackers, :id, :name)) %>

<% if @available_statuses.any? %>

- + <%= select_tag('issue[status_id]', "" + options_from_collection_for_select(@available_statuses, :id, :name)) %>

<% end %>

- + <%= select_tag('issue[priority_id]', "" + options_from_collection_for_select(IssuePriority.active, :id, :name)) %>

- + <%= select_tag('issue[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_nobody), :value => 'none') + principals_options_for_select(@assignables)) %>

<% if @project %>

- + <%= select_tag('issue[category_id]', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_none), :value => 'none') + options_from_collection_for_select(@project.issue_categories, :id, :name)) %> @@ -40,7 +40,7 @@ <% #TODO: allow editing versions when multiple projects %> <% if @project %>

- + <%= select_tag('issue[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_none), :value => 'none') + version_options_for_select(@project.shared_versions.open.sort)) %> @@ -48,7 +48,7 @@ <% end %> <% @custom_fields.each do |custom_field| %> -

<%= custom_field_tag_for_bulk_edit('issue', custom_field, @projects) %>

+

<% end %> <%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %> @@ -57,23 +57,23 @@
<% if @project && User.current.allowed_to?(:manage_subtasks, @project) %>

- + <%= text_field_tag 'issue[parent_issue_id]', '', :size => 10 %>

<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:project_id => @project) }')" %> <% end %>

- + <%= text_field_tag 'issue[start_date]', '', :size => 10 %><%= calendar_for('issue_start_date') %>

- + <%= text_field_tag 'issue[due_date]', '', :size => 10 %><%= calendar_for('issue_due_date') %>

<% if Issue.use_field_for_done_ratio? %>

- + <%= select_tag 'issue[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>

<% end %> diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 2fc163e90..a5e657ec1 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -26,7 +26,7 @@ <%= render :partial => 'queries/columns', :locals => {:query => @query} %> - <%= l(:field_group_by) %> + <%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by)) %>