From 45d05bd2d9afc47c2a0c31bfc2f4c902d4d0f919 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 29 May 2011 10:53:26 +0000 Subject: [PATCH] code clean up settings helper. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5950 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/settings_helper.rb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index a5f10586c..4c7a7c44e 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -33,7 +33,9 @@ module SettingsHelper choices = [[blank_text.is_a?(Symbol) ? l(blank_text) : blank_text, '']] + choices end setting_label(setting, options) + - select_tag("settings[#{setting}]", options_for_select(choices, Setting.send(setting).to_s), options) + select_tag("settings[#{setting}]", + options_for_select(choices, Setting.send(setting).to_s), + options) end def setting_multiselect(setting, choices, options={}) @@ -44,10 +46,15 @@ module SettingsHelper hidden_field_tag("settings[#{setting}][]", '') + choices.collect do |choice| text, value = (choice.is_a?(Array) ? choice : [choice, choice]) - content_tag('label', - check_box_tag("settings[#{setting}][]", value, Setting.send(setting).include?(value)) + text.to_s, + content_tag( + 'label', + check_box_tag( + "settings[#{setting}][]", + value, + Setting.send(setting).include?(value) + ) + text.to_s, :class => 'block' - ) + ) end.join end @@ -64,7 +71,7 @@ module SettingsHelper def setting_check_box(setting, options={}) setting_label(setting, options) + hidden_field_tag("settings[#{setting}]", 0) + - check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options) + check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options) end def setting_label(setting, options={}) -- 2.39.5