From 0f7dc3701516111a0640c276522125f79f89355b Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Mon, 1 Sep 2014 14:07:53 +0200
Subject: [PATCH] fix config value override

Conflicts:
	app/helpers/admin/configs_helper.rb
---
 app/helpers/admin/configs_helper.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/helpers/admin/configs_helper.rb b/app/helpers/admin/configs_helper.rb
index 68d759fc..370b36c4 100644
--- a/app/helpers/admin/configs_helper.rb
+++ b/app/helpers/admin/configs_helper.rb
@@ -121,9 +121,11 @@ module Admin::ConfigsHelper
   def config_input_field_options(form, key, options)
     cfg_path = form.lookup_model_names[1..-1] + [key]
     # set current value
-    value = @cfg
-    cfg_path.each {|n| value = value[n] unless value.nil? }
-    options[:value] ||= value
+    unless options.has_key?(:value)
+      value = @cfg
+      cfg_path.each {|n| value = value[n.to_sym] if value.respond_to? :[] }
+      options[:value] = value
+    end
     options
   end
 end