Browse Source

Removed duplicate ids.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10125 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/2.1.0
Jean-Philippe Lang 12 years ago
parent
commit
1e6938a119
2 changed files with 5 additions and 9 deletions
  1. 4
    3
      app/helpers/settings_helper.rb
  2. 1
    6
      app/views/settings/_repositories.html.erb

+ 4
- 3
app/helpers/settings_helper.rb View File

@@ -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

+ 1
- 6
app/views/settings/_repositories.html.erb View File

@@ -16,12 +16,7 @@
<% enabled = Setting.send(setting).include?(value) %>
<tr>
<td class="scm_name">
<%=
check_box_tag(
"settings[#{setting}][]",
value,
enabled)
%>
<%= check_box_tag("settings[#{setting}][]", value, enabled, :id => nil) %>
<%= text.to_s %>
</td>
<td>

Loading…
Cancel
Save