equal
deleted
inserted
replaced
135 dynainclude += originclude |
135 dynainclude += originclude |
136 dynaexclude += origexclude |
136 dynaexclude += origexclude |
137 |
137 |
138 # The most interesting parameter, the 'extra fields' dictionary |
138 # The most interesting parameter, the 'extra fields' dictionary |
139 dynaconf = getattr(meta, 'dynaconf', {}) |
139 dynaconf = getattr(meta, 'dynaconf', {}) |
140 if not dynaproperties: |
140 dynaproperties = dicts.merge(dynaproperties, dynaconf) |
141 dynaproperties = dynaconf |
|
142 else: |
|
143 dicts.merge(dynaproperties, dynaconf) |
|
144 |
141 |
145 # Create a new DynaForm, using the properties we extracted |
142 # Create a new DynaForm, using the properties we extracted |
146 return newDynaForm( |
143 return newDynaForm( |
147 dynamodel=dynamodel, |
144 dynamodel=dynamodel, |
148 dynabase=dynaform, |
145 dynabase=dynaform, |