kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed duplicate ids. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10125 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-07-29 12:04:11 +00:00
parent 9ef719f15e
commit 1e6938a119
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/helpers/settings_helper.rb
View File

@ -53,7 +53,8 @@ module SettingsHelper
check_box_tag( check_box_tag(
"settings[#{setting}][]", "settings[#{setting}][]",
value, value,
Setting.send(setting).include?(value) Setting.send(setting).include?(value),
:id => nil
) + text.to_s, ) + text.to_s,
:class => 'block' :class => 'block'
) )
@ -72,7 +73,7 @@ module SettingsHelper
def setting_check_box(setting, options={}) def setting_check_box(setting, options={})
setting_label(setting, options).html_safe + 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 check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options).html_safe
end end
@ -86,7 +87,7 @@ module SettingsHelper
return content_tag(:label, return content_tag(:label,
check_box_tag('settings[notified_events][]', check_box_tag('settings[notified_events][]',
notifiable.name, 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, l_or_humanize(notifiable.name, :prefix => 'label_').html_safe,
:class => notifiable.parent.present? ? "parent" : '').html_safe :class => notifiable.parent.present? ? "parent" : '').html_safe
end end

7
app/views/settings/_repositories.html.erb
View File

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