@@ -53,7 +53,8 module SettingsHelper | |||||
53 | check_box_tag( |
|
53 | check_box_tag( | |
54 | "settings[#{setting}][]", |
|
54 | "settings[#{setting}][]", | |
55 | value, |
|
55 | value, | |
56 | Setting.send(setting).include?(value) |
|
56 | Setting.send(setting).include?(value), | |
|
57 | :id => nil | |||
57 | ) + text.to_s, |
|
58 | ) + text.to_s, | |
58 | :class => 'block' |
|
59 | :class => 'block' | |
59 | ) |
|
60 | ) | |
@@ -72,7 +73,7 module SettingsHelper | |||||
72 |
|
73 | |||
73 | def setting_check_box(setting, options={}) |
|
74 | def setting_check_box(setting, options={}) | |
74 | setting_label(setting, options).html_safe + |
|
75 | setting_label(setting, options).html_safe + | |
75 | hidden_field_tag("settings[#{setting}]", 0).html_safe + |
|
76 | hidden_field_tag("settings[#{setting}]", 0, :id => nil).html_safe + | |
76 | check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options).html_safe |
|
77 | check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options).html_safe | |
77 | end |
|
78 | end | |
78 |
|
79 | |||
@@ -86,7 +87,7 module SettingsHelper | |||||
86 | return content_tag(:label, |
|
87 | return content_tag(:label, | |
87 | check_box_tag('settings[notified_events][]', |
|
88 | check_box_tag('settings[notified_events][]', | |
88 | notifiable.name, |
|
89 | notifiable.name, | |
89 | Setting.notified_events.include?(notifiable.name)).html_safe + |
|
90 | Setting.notified_events.include?(notifiable.name), :id => nil).html_safe + | |
90 | l_or_humanize(notifiable.name, :prefix => 'label_').html_safe, |
|
91 | l_or_humanize(notifiable.name, :prefix => 'label_').html_safe, | |
91 | :class => notifiable.parent.present? ? "parent" : '').html_safe |
|
92 | :class => notifiable.parent.present? ? "parent" : '').html_safe | |
92 | end |
|
93 | end |
@@ -16,12 +16,7 | |||||
16 | <% enabled = Setting.send(setting).include?(value) %> |
|
16 | <% enabled = Setting.send(setting).include?(value) %> | |
17 | <tr> |
|
17 | <tr> | |
18 | <td class="scm_name"> |
|
18 | <td class="scm_name"> | |
19 | <%= |
|
19 | <%= check_box_tag("settings[#{setting}][]", value, enabled, :id => nil) %> | |
20 | check_box_tag( |
|
|||
21 | "settings[#{setting}][]", |
|
|||
22 | value, |
|
|||
23 | enabled) |
|
|||
24 | %> |
|
|||
25 | <%= text.to_s %> |
|
20 | <%= text.to_s %> | |
26 | </td> |
|
21 | </td> | |
27 | <td> |
|
22 | <td> |
General Comments 0
You need to be logged in to leave comments.
Login now