# HG changeset patch # User Sverre Rabbelier # Date 1236700406 0 # Node ID d7c5112b1d448228007d8366d4e4eac2209ca754 # Parent d5dacf2be926c0982c8c978018c5e5b9830bea0a Use the correct timeline logic in edit() Patch by: Sverre Rabbelier diff -r d5dacf2be926 -r d7c5112b1d44 app/soc/views/models/timeline.py --- a/app/soc/views/models/timeline.py Tue Mar 10 15:52:53 2009 +0000 +++ b/app/soc/views/models/timeline.py Tue Mar 10 15:53:26 2009 +0000 @@ -87,8 +87,9 @@ page_name=None, params=None, seed=None, **kwargs): """See base.View.edit. """ + params = dicts.merge(params, self._params) - + # TODO(pawel.solyga): If program doesn't exist for timeline display # customized error message without pointing to 'Create Timeline' @@ -96,7 +97,9 @@ program = program_logic.logic.getFromKeyFields(key_fields) if program: - params['edit_form'] = params["edit_form_%s" % program.workflow] + workflow = program.workflow + params['edit_form'] = params["edit_form_%s" % workflow] + params['logic'] = program_logic.logic.TIMELINE_LOGIC[workflow] return super(View, self).edit(request, access_type, page_name=page_name, params=params, seed=seed, **kwargs)