From e9689f5fe32666b238a1a634d385399bb9a3f025 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 11 Jan 2014 12:55:21 +0000
Subject: [PATCH] Removes duplicate ids (#15485).

git-svn-id: http://svn.redmine.org/redmine/trunk@12657 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/groups/_memberships.html.erb        | 4 ++--
 app/views/projects/_form.html.erb             | 6 ++++--
 app/views/projects/settings/_members.html.erb | 3 ++-
 app/views/projects/settings/_modules.html.erb | 2 +-
 app/views/roles/_form.html.erb                | 2 +-
 app/views/trackers/_form.html.erb             | 4 ++--
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/views/groups/_memberships.html.erb b/app/views/groups/_memberships.html.erb
index b21958e28..777a0df7c 100644
--- a/app/views/groups/_memberships.html.erb
+++ b/app/views/groups/_memberships.html.erb
@@ -20,7 +20,7 @@
                  :url => { :action => 'edit_membership', :id => @group, :membership_id => membership },
                  :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
         <p><% roles.each do |role| %>
-        <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role) %> <%=h role %></label><br />
+        <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role), :id => nil %> <%=h role %></label><br />
         <% end %></p>
         <p><%= submit_tag l(:button_change) %>
         <%= link_to_function(
@@ -56,7 +56,7 @@
 <%= select_tag 'membership[project_id]', options_for_membership_project_select(@group, projects) %>
 <p><%= l(:label_role_plural) %>:
 <% roles.each do |role| %>
-  <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
+  <label><%= check_box_tag 'membership[role_ids][]', role.id, false, :id => nil %> <%=h role %></label>
 <% end %></p>
 <p><%= submit_tag l(:button_add) %></p>
 <% end %>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 9077a0120..03202833e 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -45,7 +45,7 @@
 <fieldset class="box tabular" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend>
 <% @trackers.each do |tracker| %>
     <label class="floating">
-    <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
+    <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker), :id => nil %>
     <%=h tracker %>
     </label>
 <% end %>
@@ -57,7 +57,9 @@
 <fieldset class="box tabular" id="project_issue_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
 <% @issue_custom_fields.each do |custom_field| %>
     <label class="floating">
-  <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
+  <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field),
+        :disabled => (custom_field.is_for_all? ? "disabled" : nil),
+        :id => nil %>
   <%=h custom_field.name %>
   </label>
 <% end %>
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index 90a9d549d..ac62d48db 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -29,6 +29,7 @@
           <label>
             <%= check_box_tag('membership[role_ids][]',
                               role.id, member.roles.include?(role),
+                              :id => nil,
                               :disabled => member.member_roles.detect {
                                  |mr| mr.role_id == role.id && !mr.inherited_from.nil?
                                  } ) %> <%= role %>
@@ -79,7 +80,7 @@
       <p>
         <%= l(:label_role_plural) %>:
         <% roles.each do |role| %>
-          <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%= role %></label>
+          <label><%= check_box_tag 'membership[role_ids][]', role.id, false, :id => nil %> <%= role %></label>
         <% end %>
       </p>
       <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
diff --git a/app/views/projects/settings/_modules.html.erb b/app/views/projects/settings/_modules.html.erb
index d151a04b5..c52741e5a 100644
--- a/app/views/projects/settings/_modules.html.erb
+++ b/app/views/projects/settings/_modules.html.erb
@@ -7,7 +7,7 @@
 <legend><%= l(:text_select_project_modules) %></legend>
 
 <% Redmine::AccessControl.available_project_modules.each do |m| %>
-<p><label><%= check_box_tag 'enabled_module_names[]', m, @project.module_enabled?(m) -%>
+<p><label><%= check_box_tag 'enabled_module_names[]', m, @project.module_enabled?(m), :id => nil -%>
  <%= l_or_humanize(m, :prefix => "project_module_") %></label></p>
 <% end %>
 </fieldset>
diff --git a/app/views/roles/_form.html.erb b/app/views/roles/_form.html.erb
index d028c2f1c..e3c32ee84 100644
--- a/app/views/roles/_form.html.erb
+++ b/app/views/roles/_form.html.erb
@@ -21,7 +21,7 @@
     <fieldset><legend><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
     <% perms_by_module[mod].each do |permission| %>
         <label class="floating">
-        <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
+        <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name), :id => nil %>
         <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
         </label>
     <% end %>
diff --git a/app/views/trackers/_form.html.erb b/app/views/trackers/_form.html.erb
index 616f45482..4c73555f9 100644
--- a/app/views/trackers/_form.html.erb
+++ b/app/views/trackers/_form.html.erb
@@ -10,7 +10,7 @@
   <label><%= l(:field_core_fields) %></label>
   <% Tracker::CORE_FIELDS.each do |field| %>
   <label class="block">
-    <%= check_box_tag 'tracker[core_fields][]', field, @tracker.core_fields.include?(field) %>
+    <%= check_box_tag 'tracker[core_fields][]', field, @tracker.core_fields.include?(field), :id => nil %>
     <%= l("field_#{field}".sub(/_id$/, '')) %>
   </label>
   <% end %>
@@ -22,7 +22,7 @@
   <label><%= l(:label_custom_field_plural) %></label>
   <% IssueCustomField.all.each do |field| %>
     <label class="block">
-      <%= check_box_tag 'tracker[custom_field_ids][]',field.id, @tracker.custom_fields.to_a.include?(field) %>
+      <%= check_box_tag 'tracker[custom_field_ids][]',field.id, @tracker.custom_fields.to_a.include?(field), :id => nil %>
       <%=h field.name %>
     </label>
   <% end %>
-- 
2.39.5