--- a/app/soc/views/models/base.py Fri Mar 06 22:31:43 2009 +0000
+++ b/app/soc/views/models/base.py Fri Mar 06 22:32:26 2009 +0000
@@ -660,21 +660,12 @@
fields: the new field values
"""
- scope_path = self._logic.getKeyNameFromFields(fields)
-
- key_fields = {
- 'scope_path': scope_path,
- 'prefix': self._params['document_prefix'],
- }
-
- for field_name, original_name, logic, _ in self._params['references']:
+ references = self._params['references']
+ for field_name, original_name, _ in references:
if field_name not in fields:
continue
- key_fields['link_id'] = fields[field_name]
-
- # TODO notify the user if home_doc is not found
- entity = logic.getFromKeyFields(key_fields)
+ entity = fields.get('resolved_%s' % field_name)
fields[original_name] = entity
# If scope_logic is not defined, this entity has no scope
@@ -723,7 +714,7 @@
if 'scope_path' in form.fields:
form.fields['scope_path'].initial = entity.scope_path
- for field_name, _, _, getter in self._params['references']:
+ for field_name, _, getter in self._params['references']:
try:
field = getter(entity)
form.fields[field_name].initial = field.link_id if field else None