diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-11-23 13:45:24 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-11-23 13:45:24 +0000 |
commit | 1e0045e69bb5ae0787d207fa9b65163231b737b7 (patch) | |
tree | 080f0c4fd01cc79402ed053fb67e862bb5836364 /app | |
parent | e0a034164f3409336f686cfa381da8a5db15c40e (diff) | |
download | redmine-1e0045e69bb5ae0787d207fa9b65163231b737b7.tar.gz redmine-1e0045e69bb5ae0787d207fa9b65163231b737b7.zip |
Removed duplicate element ids.
git-svn-id: http://svn.redmine.org/redmine/trunk@13644 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/workflows_helper.rb | 2 | ||||
-rw-r--r-- | app/views/activities/index.html.erb | 2 | ||||
-rw-r--r-- | app/views/issues/bulk_edit.html.erb | 2 | ||||
-rw-r--r-- | app/views/issues/destroy.html.erb | 2 | ||||
-rw-r--r-- | app/views/principal_memberships/_index.html.erb | 2 | ||||
-rw-r--r-- | app/views/projects/copy.html.erb | 14 | ||||
-rw-r--r-- | app/views/projects/settings/_members.html.erb | 2 | ||||
-rw-r--r-- | app/views/repositories/committers.html.erb | 2 | ||||
-rw-r--r-- | app/views/settings/_repositories.html.erb | 11 | ||||
-rw-r--r-- | app/views/timelog/bulk_edit.html.erb | 2 | ||||
-rw-r--r-- | app/views/versions/index.html.erb | 2 | ||||
-rw-r--r-- | app/views/workflows/edit.html.erb | 8 | ||||
-rw-r--r-- | app/views/workflows/permissions.html.erb | 8 |
13 files changed, 31 insertions, 28 deletions
diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb index 28f4fc2dd..fc30bf456 100644 --- a/app/helpers/workflows_helper.rb +++ b/app/helpers/workflows_helper.rb @@ -80,7 +80,7 @@ module WorkflowsHelper tag_name = "transitions[#{ old_status.id }][#{new_status.id}][#{name}]" if w == 0 || w == @roles.size * @trackers.size - hidden_field_tag(tag_name, "0") + + hidden_field_tag(tag_name, "0", :id => nil) + check_box_tag(tag_name, "1", w != 0, :class => "old-status-#{old_status.id} new-status-#{new_status.id}") else diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb index a3654ce29..a3a441154 100644 --- a/app/views/activities/index.html.erb +++ b/app/views/activities/index.html.erb @@ -55,7 +55,7 @@ <% end %> </ul> <% if @project && @project.descendants.active.any? %> - <%= hidden_field_tag 'with_subprojects', 0 %> + <%= hidden_field_tag 'with_subprojects', 0, :id => nil %> <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p> <% end %> <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %> diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb index b1786dde3..dfd76371e 100644 --- a/app/views/issues/bulk_edit.html.erb +++ b/app/views/issues/bulk_edit.html.erb @@ -23,7 +23,7 @@ </ul> <%= form_tag(bulk_update_issues_path, :id => 'bulk_edit_form') do %> -<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join("\n").html_safe %> +<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id, :id => nil)}.join("\n").html_safe %> <div class="box tabular"> <fieldset class="attributes"> <legend><%= l(:label_change_properties) %></legend> diff --git a/app/views/issues/destroy.html.erb b/app/views/issues/destroy.html.erb index 02d842c3b..4a0631e68 100644 --- a/app/views/issues/destroy.html.erb +++ b/app/views/issues/destroy.html.erb @@ -1,7 +1,7 @@ <h2><%= l(:label_confirmation) %></h2> <%= form_tag({}, :method => :delete) do %> -<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join("\n").html_safe %> +<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id, :id => nil)}.join("\n").html_safe %> <div class="box"> <p><strong><%= l(:text_destroy_time_entries_question, :hours => number_with_precision(@hours, :precision => 2)) %></strong></p> <p> diff --git a/app/views/principal_memberships/_index.html.erb b/app/views/principal_memberships/_index.html.erb index 8203999ad..76a629f95 100644 --- a/app/views/principal_memberships/_index.html.erb +++ b/app/views/principal_memberships/_index.html.erb @@ -28,7 +28,7 @@ :disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?}, :id => nil %> <%=h role %></label><br /> <% end %></p> - <%= hidden_field_tag 'membership[role_ids][]', '' %> + <%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %> <p><%= submit_tag l(:button_change) %> <%= link_to_function l(:button_cancel), "$('#member-#{membership.id}-roles').show(); $('#member-#{membership.id}-roles-form').hide(); return false;" diff --git a/app/views/projects/copy.html.erb b/app/views/projects/copy.html.erb index 26ec2e5a6..505ef331b 100644 --- a/app/views/projects/copy.html.erb +++ b/app/views/projects/copy.html.erb @@ -4,13 +4,13 @@ <%= render :partial => 'form', :locals => { :f => f } %> <fieldset class="box tabular"><legend><%= l(:button_copy) %></legend> - <label class="block"><%= check_box_tag 'only[]', 'members', true %> <%= l(:label_member_plural) %> (<%= @source_project.members.count %>)</label> - <label class="block"><%= check_box_tag 'only[]', 'versions', true %> <%= l(:label_version_plural) %> (<%= @source_project.versions.count %>)</label> - <label class="block"><%= check_box_tag 'only[]', 'issue_categories', true %> <%= l(:label_issue_category_plural) %> (<%= @source_project.issue_categories.count %>)</label> - <label class="block"><%= check_box_tag 'only[]', 'issues', true %> <%= l(:label_issue_plural) %> (<%= @source_project.issues.count %>)</label> - <label class="block"><%= check_box_tag 'only[]', 'queries', true %> <%= l(:label_query_plural) %> (<%= @source_project.queries.count %>)</label> - <label class="block"><%= check_box_tag 'only[]', 'boards', true %> <%= l(:label_board_plural) %> (<%= @source_project.boards.count %>)</label> - <label class="block"><%= check_box_tag 'only[]', 'wiki', true %> <%= l(:label_wiki_page_plural) %> (<%= @source_project.wiki.nil? ? 0 : @source_project.wiki.pages.count %>)</label> + <label class="block"><%= check_box_tag 'only[]', 'members', true, :id => nil %> <%= l(:label_member_plural) %> (<%= @source_project.members.count %>)</label> + <label class="block"><%= check_box_tag 'only[]', 'versions', true, :id => nil %> <%= l(:label_version_plural) %> (<%= @source_project.versions.count %>)</label> + <label class="block"><%= check_box_tag 'only[]', 'issue_categories', true, :id => nil %> <%= l(:label_issue_category_plural) %> (<%= @source_project.issue_categories.count %>)</label> + <label class="block"><%= check_box_tag 'only[]', 'issues', true, :id => nil %> <%= l(:label_issue_plural) %> (<%= @source_project.issues.count %>)</label> + <label class="block"><%= check_box_tag 'only[]', 'queries', true, :id => nil %> <%= l(:label_query_plural) %> (<%= @source_project.queries.count %>)</label> + <label class="block"><%= check_box_tag 'only[]', 'boards', true, :id => nil %> <%= l(:label_board_plural) %> (<%= @source_project.boards.count %>)</label> + <label class="block"><%= check_box_tag 'only[]', 'wiki', true, :id => nil %> <%= l(:label_wiki_page_plural) %> (<%= @source_project.wiki.nil? ? 0 : @source_project.wiki.pages.count %>)</label> <%= hidden_field_tag 'only[]', '' %> <br /> <label class="block"><%= check_box_tag 'notifications', 1, params[:notifications] %> <%= l(:label_project_copy_notifications) %></label> diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb index 569684a58..63a4bfba0 100644 --- a/app/views/projects/settings/_members.html.erb +++ b/app/views/projects/settings/_members.html.erb @@ -38,7 +38,7 @@ </label><br /> <% end %> </p> - <%= hidden_field_tag 'membership[role_ids][]', '' %> + <%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %> <p> <%= submit_tag l(:button_save), :class => "small" %> <%= link_to_function(l(:button_cancel), diff --git a/app/views/repositories/committers.html.erb b/app/views/repositories/committers.html.erb index 695c42ccb..d9c2d5d96 100644 --- a/app/views/repositories/committers.html.erb +++ b/app/views/repositories/committers.html.erb @@ -20,7 +20,7 @@ <tr class="<%= cycle 'odd', 'even' %>"> <td><%=h committer %></td> <td> - <%= hidden_field_tag "committers[#{i}][]", committer %> + <%= hidden_field_tag "committers[#{i}][]", committer, :id => nil %> <%= select_tag "committers[#{i}][]", content_tag( 'option', diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb index f54c219ac..b3c5b1b16 100644 --- a/app/views/settings/_repositories.html.erb +++ b/app/views/settings/_repositories.html.erb @@ -96,12 +96,13 @@ options_for_select( [[l(:label_all), ""]] + Tracker.sorted.map {|t| [t.name, t.id.to_s]}, - rule['if_tracker_id']) + rule['if_tracker_id']), + :id => nil ) %> </td> <td> <%= text_field_tag("settings[commit_update_keywords][keywords][]", - rule['keywords'], :size => 30) %> + rule['keywords'], :id => nil, :size => 30) %> </td> <td> <%= select_tag("settings[commit_update_keywords][status_id][]", @@ -109,7 +110,8 @@ [["", 0]] + IssueStatus.sorted. collect{|status| [status.name, status.id.to_s]}, - rule['status_id']) + rule['status_id']), + :id => nil ) %> </td> <td> @@ -117,7 +119,8 @@ options_for_select( [["", ""]] + (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, - rule['done_ratio']) + rule['done_ratio']), + :id => nil ) %> </td> <td class="buttons"> diff --git a/app/views/timelog/bulk_edit.html.erb b/app/views/timelog/bulk_edit.html.erb index a34a9afc1..8f6c674c7 100644 --- a/app/views/timelog/bulk_edit.html.erb +++ b/app/views/timelog/bulk_edit.html.erb @@ -8,7 +8,7 @@ </ul> <%= form_tag(bulk_update_time_entries_path, :id => 'bulk_edit_form') do %> -<%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %> +<%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id, :id => nil)}.join.html_safe %> <div class="box tabular"> <div> <p> diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb index 85442bd76..b4b485587 100644 --- a/app/views/versions/index.html.erb +++ b/app/views/versions/index.html.erb @@ -56,7 +56,7 @@ </li> <% if @project.descendants.active.any? %> <li> - <%= hidden_field_tag 'with_subprojects', 0 %> + <%= hidden_field_tag 'with_subprojects', 0, :id => nil %> <label> <%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%> </label> diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb index 19b409357..e2a7f5810 100644 --- a/app/views/workflows/edit.html.erb +++ b/app/views/workflows/edit.html.erb @@ -25,7 +25,7 @@ <%= submit_tag l(:button_edit), :name => nil %> - <%= hidden_field_tag 'used_statuses_only', '0' %> + <%= hidden_field_tag 'used_statuses_only', '0', :id => nil %> <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label> </p> @@ -33,9 +33,9 @@ <% if @trackers && @roles && @statuses.any? %> <%= form_tag({}, :id => 'workflow_form' ) do %> - <%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id}.join.html_safe %> - <%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id}.join.html_safe %> - <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only] %> + <%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id, :id => nil}.join.html_safe %> + <%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id, :id => nil}.join.html_safe %> + <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only], :id => nil %> <div class="autoscroll"> <%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %> diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb index 54b8304ce..2abd874a6 100644 --- a/app/views/workflows/permissions.html.erb +++ b/app/views/workflows/permissions.html.erb @@ -25,16 +25,16 @@ <%= submit_tag l(:button_edit), :name => nil %> - <%= hidden_field_tag 'used_statuses_only', '0' %> + <%= hidden_field_tag 'used_statuses_only', '0', :id => nil %> <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label> </p> <% end %> <% if @trackers && @roles && @statuses.any? %> <%= form_tag({}, :id => 'workflow_form' ) do %> - <%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id}.join.html_safe %> - <%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id}.join.html_safe %> - <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only] %> + <%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id, :id => nil}.join.html_safe %> + <%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id, :id => nil}.join.html_safe %> + <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only], :id => nil %> <div class="autoscroll"> <table class="list workflows fields_permissions"> <thead> |