Removes duplicate ids (#15485).
git-svn-id: http://svn.redmine.org/redmine/trunk@12657 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
d302450731
commit
e9689f5fe3
|
@ -20,7 +20,7 @@
|
||||||
:url => { :action => 'edit_membership', :id => @group, :membership_id => membership },
|
:url => { :action => 'edit_membership', :id => @group, :membership_id => membership },
|
||||||
:html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
|
:html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
|
||||||
<p><% roles.each do |role| %>
|
<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>
|
<% end %></p>
|
||||||
<p><%= submit_tag l(:button_change) %>
|
<p><%= submit_tag l(:button_change) %>
|
||||||
<%= link_to_function(
|
<%= link_to_function(
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
<%= select_tag 'membership[project_id]', options_for_membership_project_select(@group, projects) %>
|
<%= select_tag 'membership[project_id]', options_for_membership_project_select(@group, projects) %>
|
||||||
<p><%= l(:label_role_plural) %>:
|
<p><%= l(:label_role_plural) %>:
|
||||||
<% roles.each do |role| %>
|
<% 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>
|
<% end %></p>
|
||||||
<p><%= submit_tag l(:button_add) %></p>
|
<p><%= submit_tag l(:button_add) %></p>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
<fieldset class="box tabular" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend>
|
<fieldset class="box tabular" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend>
|
||||||
<% @trackers.each do |tracker| %>
|
<% @trackers.each do |tracker| %>
|
||||||
<label class="floating">
|
<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 %>
|
<%=h tracker %>
|
||||||
</label>
|
</label>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -57,7 +57,9 @@
|
||||||
<fieldset class="box tabular" id="project_issue_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
|
<fieldset class="box tabular" id="project_issue_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
|
||||||
<% @issue_custom_fields.each do |custom_field| %>
|
<% @issue_custom_fields.each do |custom_field| %>
|
||||||
<label class="floating">
|
<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 %>
|
<%=h custom_field.name %>
|
||||||
</label>
|
</label>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
<label>
|
<label>
|
||||||
<%= check_box_tag('membership[role_ids][]',
|
<%= check_box_tag('membership[role_ids][]',
|
||||||
role.id, member.roles.include?(role),
|
role.id, member.roles.include?(role),
|
||||||
|
:id => nil,
|
||||||
:disabled => member.member_roles.detect {
|
:disabled => member.member_roles.detect {
|
||||||
|mr| mr.role_id == role.id && !mr.inherited_from.nil?
|
|mr| mr.role_id == role.id && !mr.inherited_from.nil?
|
||||||
} ) %> <%= role %>
|
} ) %> <%= role %>
|
||||||
|
@ -79,7 +80,7 @@
|
||||||
<p>
|
<p>
|
||||||
<%= l(:label_role_plural) %>:
|
<%= l(:label_role_plural) %>:
|
||||||
<% roles.each do |role| %>
|
<% 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 %>
|
<% end %>
|
||||||
</p>
|
</p>
|
||||||
<p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
|
<p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<legend><%= l(:text_select_project_modules) %></legend>
|
<legend><%= l(:text_select_project_modules) %></legend>
|
||||||
|
|
||||||
<% Redmine::AccessControl.available_project_modules.each do |m| %>
|
<% 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>
|
<%= l_or_humanize(m, :prefix => "project_module_") %></label></p>
|
||||||
<% end %>
|
<% end %>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
<fieldset><legend><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
|
<fieldset><legend><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
|
||||||
<% perms_by_module[mod].each do |permission| %>
|
<% perms_by_module[mod].each do |permission| %>
|
||||||
<label class="floating">
|
<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_') %>
|
<%= l_or_humanize(permission.name, :prefix => 'permission_') %>
|
||||||
</label>
|
</label>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<label><%= l(:field_core_fields) %></label>
|
<label><%= l(:field_core_fields) %></label>
|
||||||
<% Tracker::CORE_FIELDS.each do |field| %>
|
<% Tracker::CORE_FIELDS.each do |field| %>
|
||||||
<label class="block">
|
<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$/, '')) %>
|
<%= l("field_#{field}".sub(/_id$/, '')) %>
|
||||||
</label>
|
</label>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
<label><%= l(:label_custom_field_plural) %></label>
|
<label><%= l(:label_custom_field_plural) %></label>
|
||||||
<% IssueCustomField.all.each do |field| %>
|
<% IssueCustomField.all.each do |field| %>
|
||||||
<label class="block">
|
<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 %>
|
<%=h field.name %>
|
||||||
</label>
|
</label>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
Loading…
Reference in New Issue