diff -r 65c8d1bfe94b -r 0a723ff3d27c app/soc/views/models/presence_with_tos.py
--- a/app/soc/views/models/presence_with_tos.py	Sat Jan 31 15:40:32 2009 +0000
+++ b/app/soc/views/models/presence_with_tos.py	Sat Jan 31 15:41:45 2009 +0000
@@ -76,15 +76,17 @@
     """See base.View._editPost().
     """
 
-    prefix = self._params['document_prefix']
-    key_fields = self._logic.getKeyFieldsFromDict(fields)
-    scope_path = self._logic.getKeyNameForFields(key_fields)
+    key_fields = self._logic.getKeyFieldsFromFields(fields)
+    scope_path = self._logic.getKeyNameFromFields(key_fields)
 
-    tos_link_id = fields['tos_link_id']
+    key_fields = {
+        'scope_path': scope_path,
+        'link_id': fields['tos_link_id'],
+        'prefix': self._params['document_prefix'],
+        }
 
     # TODO notify the user if tos_doc is not found
-    tos_doc = document_logic.logic.getFromFields(
-      scope_path=scope_path, link_id=tos_link_id, prefix=prefix)
+    tos_doc = document_logic.logic.getFromKeyFields(key_fields)
 
     fields['tos'] = tos_doc