Download as
Browse Code »

Commit a32920024e1e99d544b91a5c8142e1eafaef8086

Authored by AntonioTerceiro
1 parent 5b598267
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem393: must be able to set settings to false (only a nil value 

implies using the informed default)


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1799 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 11 additions and 2 deletions   Show diff stats
lib/acts_as_having_settings.rb
  Diff comments   View file @a329200
@@ -21,12 +21,13 @@ module ActsAsHavingSettings @@ -21,12 +21,13 @@ module ActsAsHavingSettings
21 def settings_items(*names) 21 def settings_items(*names)
22 22
23 options = names.last.is_a?(Hash) ? names.pop : {} 23 options = names.last.is_a?(Hash) ? names.pop : {}
24 - default = options[:default] ? "|| #{options[:default].inspect}" : "" 24 + default = options[:default] ? options[:default].inspect : "val"
25 25
26 names.each do |setting| 26 names.each do |setting|
27 class_eval <<-CODE 27 class_eval <<-CODE
28 def #{setting} 28 def #{setting}
29 - send(self.class.settings_field)[:#{setting}] #{default} 29 + val = send(self.class.settings_field)[:#{setting}]
  30 + val.nil? ? #{default} : val
30 end 31 end
31 def #{setting}=(value) 32 def #{setting}=(value)
32 send(self.class.settings_field)[:#{setting}] = value 33 send(self.class.settings_field)[:#{setting}] = value
test/unit/acts_as_having_settings_test.rb
  Diff comments   View file @a329200
@@ -48,4 +48,12 @@ class ActsAsHavingSettingsTest &lt; Test::Unit::TestCase @@ -48,4 +48,12 @@ class ActsAsHavingSettingsTest &lt; Test::Unit::TestCase
48 assert_equal 10, block_class.new.some_setting 48 assert_equal 10, block_class.new.some_setting
49 end 49 end
50 50
  51 + should 'be able to set boolean attributes to false with a default of true' do
  52 + klass = Class.new(Block)
  53 + klass.settings_items :flag, :default => true
  54 + obj = klass.new
  55 + obj.flag = false
  56 + assert_equal false, obj.flag
  57 + end
  58 +
51 end 59 end