app/soc/views/helper/dynaform.py
changeset 2177 e2c193e1f631
parent 2083 a41d019a14c2
--- a/app/soc/views/helper/dynaform.py	Mon Apr 13 15:30:48 2009 +0000
+++ b/app/soc/views/helper/dynaform.py	Mon Apr 13 15:31:39 2009 +0000
@@ -137,10 +137,7 @@
 
     # The most interesting parameter, the 'extra fields' dictionary
     dynaconf = getattr(meta, 'dynaconf', {})
-    if not dynaproperties:
-      dynaproperties = dynaconf
-    else:
-      dicts.merge(dynaproperties, dynaconf)
+    dynaproperties = dicts.merge(dynaproperties, dynaconf)
 
   # Create a new DynaForm, using the properties we extracted
   return newDynaForm(