diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-01-11 12:55:21 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-01-11 12:55:21 +0000 |
| commit | e9689f5fe32666b238a1a634d385399bb9a3f025 (patch) | |
| tree | db4d367e4afa9bf040df1da39c97c67fca53da0b /app/views/projects | |
| parent | d302450731e803db53841ef83cf0ee6611be7d3d (diff) | |
| download | redmine-e9689f5fe32666b238a1a634d385399bb9a3f025.tar.gz redmine-e9689f5fe32666b238a1a634d385399bb9a3f025.zip | |
Removes duplicate ids (#15485).
git-svn-id: http://svn.redmine.org/redmine/trunk@12657 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/_form.html.erb | 6 | ||||
| -rw-r--r-- | app/views/projects/settings/_members.html.erb | 3 | ||||
| -rw-r--r-- | app/views/projects/settings/_modules.html.erb | 2 |
3 files changed, 7 insertions, 4 deletions
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> |