jro_apps/redmine Commit - r12382:e9689f5fe326

Removes duplicate ids (#15485)....

Jean-Philippe Lang -

r12382:e9689f5fe326

parent child

Context file:

r12382:e9689f5fe326

Collapse all files

app/views/groups/_memberships.html.erb +2 -2

             <% roles = Role.find_all_givable %>
             <% projects = Project.active.all %>
             <div class="splitcontentleft">
             <% if @group.memberships.any? %>
             <table class="list memberships">
               <thead><tr>
                 <th><%= l(:label_project) %></th>
                 <th><%= l(:label_role_plural) %></th>
                 <th style="width:15%"></th>
               </tr></thead>
               <tbody>
               <% @group.memberships.each do |membership| %>
               <% next if membership.new_record? %>
               <tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
               <td class="project"><%= link_to_project membership.project %></td>
               <td class="roles">
                 <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
                 <%= form_for(:membership, :remote => true,
                              :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(
                           l(:button_cancel),
                           "$('#member-#{membership.id}-roles').show(); $('#member-#{membership.id}-roles-form').hide(); return false;"
                         ) %></p>
                 <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function(
                         l(:button_edit),
                         "$('#member-#{membership.id}-roles').hide(); $('#member-#{membership.id}-roles-form').show(); return false;",
                         :class => 'icon icon-edit'
                       ) %>
                   <%= delete_link({:controller => 'groups', :action => 'destroy_membership', :id => @group, :membership_id => membership},
                                   :remote => true,
                                   :method => :post) %>
               </td>
               </tr>
             <% end; reset_cycle %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <% if projects.any? %>
             <fieldset><legend><%=l(:label_project_new)%></legend>
             <%= form_for(:membership, :remote => true, :url => { :action => 'edit_membership', :id => @group }) do %>
             <%= label_tag "membership_project_id", l(:description_choose_project), :class => "hidden-for-sighted" %>
             <%= 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 %>
             </fieldset>
             <% end %>
             </div>

app/views/projects/_form.html.erb +4 -2

             <%= error_messages_for 'project' %>
             <div class="box tabular">
             <!--[form:project]-->
             <p><%= f.text_field :name, :required => true, :size => 60 %></p>
             <p><%= f.text_area :description, :rows => 8, :class => 'wiki-edit' %></p>
             <p><%= f.text_field :identifier, :required => true, :size => 60, :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %>
             <% unless @project.identifier_frozen? %>
               <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
             <% end %></p>
             <p><%= f.text_field :homepage, :size => 60 %></p>
             <p><%= f.check_box :is_public %></p>
             <% unless @project.allowed_parents.compact.empty? %>
                 <p><%= label(:project, :parent_id, l(:field_parent)) %><%= parent_project_select_tag(@project) %></p>
             <% end %>
             <% if @project.safe_attribute? 'inherit_members' %>
             <p><%= f.check_box :inherit_members %></p>
             <% end %>
             <%= wikitoolbar_for 'project_description' %>
             <% @project.custom_field_values.each do |value| %>
               <p><%= custom_field_tag_with_label :project, value %></p>
             <% end %>
             <%= call_hook(:view_projects_form, :project => @project, :form => f) %>
             </div>
             <% if @project.new_record? %>
             <fieldset class="box tabular"><legend><%= l(:label_module_plural) %></legend>
             <% Redmine::AccessControl.available_project_modules.each do |m| %>
                 <label class="floating">
                 <%= check_box_tag 'project[enabled_module_names][]', m, @project.module_enabled?(m), :id => "project_enabled_module_names_#{m}" %>
                 <%= l_or_humanize(m, :prefix => "project_module_") %>
                 </label>
             <% end %>
             <%= hidden_field_tag 'project[enabled_module_names][]', '' %>
             </fieldset>
             <% end %>
             <% if @project.new_record? || @project.module_enabled?('issue_tracking') %>
             <% unless @trackers.empty? %>
             <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 %>
             <%= hidden_field_tag 'project[tracker_ids][]', '' %>
             </fieldset>
             <% end %>
             <% unless @issue_custom_fields.empty? %>
             <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 %>
             <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
             </fieldset>
             <% end %>
             <% end %>
             <!--[eoform:project]-->
             <% unless @project.identifier_frozen? %>
               <% content_for :header_tags do %>
                 <%= javascript_include_tag 'project_identifier' %>
               <% end %>
             <% end %>
             <% if !User.current.admin? && @project.inherit_members? && @project.parent && User.current.member_of?(@project.parent) %>
               <%= javascript_tag do %>
                 $(document).ready(function() {
                   $("#project_inherit_members").change(function(){
                     if (!$(this).is(':checked')) {
                       if (!confirm("<%= escape_javascript(l(:text_own_membership_delete_confirmation)) %>")) {
                         $("#project_inherit_members").attr("checked", true);
                       }
                     }
                   });
                 });
               <% end %>
             <% end %>
             <%= javascript_tag do %>
             $(document).ready(function() {
               $('#project_enabled_module_names_issue_tracking').on('change', function(){
                 if ($(this).attr('checked')){
                   $('#project_trackers, #project_issue_custom_fields').show();
                 } else {
                   $('#project_trackers, #project_issue_custom_fields').hide();
                 }
               }).trigger('change');
             });
             <% end %>

app/views/projects/settings/_members.html.erb +2 -1

             <%= error_messages_for 'member' %>
             <% roles = Role.find_all_givable
                members = @project.member_principals.includes(:member_roles, :roles, :principal).all.sort %>
             <div class="splitcontentleft">
             <% if members.any? %>
             <table class="list members">
               <thead><tr>
                 <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
                 <th><%= l(:label_role_plural) %></th>
                 <th style="width:15%"></th>
                       <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
               </tr></thead>
               <tbody>
               <% members.each do |member| %>
               <% next if member.new_record? %>
               <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
               <td class="name <%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
               <td class="roles">
                 <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
                   <%= form_for(member,
                                {:as => :membership, :remote => true,
                                 :url => membership_path(member),
                                 :method => :put,
                                 :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }}
                          ) do |f| %>
                     <p>
                       <% roles.each do |role| %>
                       <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 %>
                       </label><br />
                       <% end %>
                     </p>
                     <%= hidden_field_tag 'membership[role_ids][]', '' %>
                     <p>
                       <%= submit_tag l(:button_save), :class => "small" %>
                       <%= link_to_function(l(:button_cancel),
                                            "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;") %>
                     </p>
                   <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function l(:button_edit),
                                        "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
                                        :class => 'icon icon-edit' %>
                   <%= delete_link membership_path(member),
                                   :remote => true,
                                   :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
               </td>
               <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
               </tr>
             <% end; reset_cycle %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <% if roles.any? %>
               <%= form_for(@member,
                            {:as => :membership, :url => project_memberships_path(@project),
                             :remote => true, :method => :post}) do |f| %>
                 <fieldset>
                   <legend><%=l(:label_member_new)%></legend>
                   <p>
                     <%= label_tag("principal_search", l(:label_principal_search)) %>
                     <%= text_field_tag('principal_search', nil) %>
                   </p>
                   <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
                   <div id="principals_for_new_member">
                     <%= render_principals_for_new_members(@project) %>
                   </div>
                   <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>
                 </fieldset>
               <% end %>
             <% end %>
             </div>

app/views/projects/settings/_modules.html.erb +1 -1

             <%= form_for @project,
                         :url => { :action => 'modules', :id => @project },
                         :html => {:id => 'modules-form',
                                   :method => :post} do |f| %>
             <fieldset class="box">
             <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>
             <p><%= check_all_links 'modules-form' %></p>
             <p><%= submit_tag l(:button_save) %></p>
             <% end %>

app/views/roles/_form.html.erb +1 -1

             <%= error_messages_for 'role' %>
             <% unless @role.anonymous? %>
             <div class="box tabular">
             <% unless @role.builtin? %>
             <p><%= f.text_field :name, :required => true %></p>
             <p><%= f.check_box :assignable %></p>
             <% end %>
             <p><%= f.select :issues_visibility, Role::ISSUES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %></p>
             <% if @role.new_record? && @roles.any? %>
             <p><label for="copy_workflow_from"><%= l(:label_copy_workflow_from) %></label>
             <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name, params[:copy_workflow_from] || @copy_from.try(:id))) %></p>
             <% end %>
             </div>
             <% end %>
             <h3><%= l(:label_permissions) %></h3>
             <div class="box tabular" id="permissions">
             <% perms_by_module = @role.setable_permissions.group_by {|p| p.project_module.to_s} %>
             <% perms_by_module.keys.sort.each do |mod| %>
                 <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 %>
                 </fieldset>
             <% end %>
             <br /><%= check_all_links 'permissions' %>
             <%= hidden_field_tag 'role[permissions][]', '' %>
             </div>

app/views/trackers/_form.html.erb +2 -2

             <%= error_messages_for 'tracker' %>
             <div class="splitcontentleft">
             <div class="box tabular">
             <!--[form:tracker]-->
             <p><%= f.text_field :name, :required => true %></p>
             <p><%= f.check_box :is_in_roadmap %></p>
             <p>
               <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 %>
             </p>
             <%= hidden_field_tag 'tracker[core_fields][]', '' %>
             <% if IssueCustomField.all.any? %>
             <p>
               <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 %>
             </p>
             <%= hidden_field_tag 'tracker[custom_field_ids][]', '' %>
             <% end %>
             <% if @tracker.new_record? && @trackers.any? %>
             <p><label for="copy_workflow_from"><%= l(:label_copy_workflow_from) %></label>
             <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@trackers, :id, :name)) %></p>
             <% end %>
             <!--[eoform:tracker]-->
             </div>
             <%= submit_tag l(@tracker.new_record? ? :button_create : :button_save) %>
             </div>
             <div class="splitcontentright">
             <% if @projects.any? %>
             <fieldset class="box" id="tracker_project_ids"><legend><%= l(:label_project_plural) %></legend>
             <%= render_project_nested_lists(@projects) do |p|
               content_tag('label', check_box_tag('tracker[project_ids][]', p.id, @tracker.projects.to_a.include?(p), :id => nil) + ' ' + h(p))
             end %>
             <%= hidden_field_tag('tracker[project_ids][]', '', :id => nil) %>
             <p><%= check_all_links 'tracker_project_ids' %></p>
             </fieldset>
             <% end %>
             </div>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages