--- a/app/soc/views/models/program.py	Mon Feb 23 18:26:00 2009 +0000
+++ b/app/soc/views/models/program.py	Mon Feb 23 18:27:14 2009 +0000
@@ -136,6 +136,8 @@
     """See base._editPost().
     """
 
+    super(View, self)._editPost(request, entity, fields)
+
     if not entity:
       # there is no existing entity so create a new timeline
       fields['timeline'] = self._createTimelineForType(fields)
@@ -143,8 +145,6 @@
       # use the timeline from the entity
       fields['timeline'] = entity.timeline
 
-    super(View, self)._editPost(request, entity, fields)
-
   def _createTimelineForType(self, fields):
     """Creates and stores a timeline model for the given type of program.
     """
@@ -153,9 +153,9 @@
 
     timeline_logic = program_logic.logic.TIMELINE_LOGIC[workflow]
 
-    key_name = self._logic.getKeyNameFromFields(fields)
-
-    properties = {'scope_path': key_name}
+    key_fields = timeline_logic.getKeyFieldsFromFields(fields)
+    properties = key_fields.copy()
+    properties['scope'] = fields['scope']
 
     timeline = timeline_logic.updateOrCreateFromFields(properties, properties)
     return timeline