From 1e6938a1197bf7adf32851e4c7e750b720507315 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 29 Jul 2012 12:04:11 +0000 Subject: [PATCH] Removed duplicate ids. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10125 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/settings_helper.rb | 7 ++++--- app/views/settings/_repositories.html.erb | 7 +------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 79d74b257..af901cbcf 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -53,7 +53,8 @@ module SettingsHelper check_box_tag( "settings[#{setting}][]", value, - Setting.send(setting).include?(value) + Setting.send(setting).include?(value), + :id => nil ) + text.to_s, :class => 'block' ) @@ -72,7 +73,7 @@ module SettingsHelper def setting_check_box(setting, options={}) setting_label(setting, options).html_safe + - hidden_field_tag("settings[#{setting}]", 0).html_safe + + hidden_field_tag("settings[#{setting}]", 0, :id => nil).html_safe + check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options).html_safe end @@ -86,7 +87,7 @@ module SettingsHelper return content_tag(:label, check_box_tag('settings[notified_events][]', notifiable.name, - Setting.notified_events.include?(notifiable.name)).html_safe + + Setting.notified_events.include?(notifiable.name), :id => nil).html_safe + l_or_humanize(notifiable.name, :prefix => 'label_').html_safe, :class => notifiable.parent.present? ? "parent" : '').html_safe end diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb index 6998cce50..9375911ed 100644 --- a/app/views/settings/_repositories.html.erb +++ b/app/views/settings/_repositories.html.erb @@ -16,12 +16,7 @@ <% enabled = Setting.send(setting).include?(value) %> - <%= - check_box_tag( - "settings[#{setting}][]", - value, - enabled) - %> + <%= check_box_tag("settings[#{setting}][]", value, enabled, :id => nil) %> <%= text.to_s %>