--- a/app/soc/views/models/role.py	Sat Jan 31 15:40:32 2009 +0000
+++ b/app/soc/views/models/role.py	Sat Jan 31 15:41:45 2009 +0000
@@ -216,8 +216,8 @@
       return self.inviteGet(request, context, params, **kwargs)
 
     # extract the key_name for the new request entity
-    key_fields = request_logic.logic.getKeyFieldsFromDict(request_fields)
-    key_name = request_logic.logic.getKeyNameForFields(key_fields)
+    key_fields = request_logic.logic.getKeyFieldsFromFields(request_fields)
+    key_name = request_logic.logic.getKeyNameFromFields(key_fields)
 
     # create the request entity
     entity = request_logic.logic.updateOrCreateFromKeyName(request_fields, 
@@ -330,8 +330,8 @@
     fields ['status'] = 'active'
 
     # get the key_name for the new entity
-    key_fields =  self._logic.getKeyFieldsFromDict(fields)
-    key_name = self._logic.getKeyNameForFields(key_fields)
+    key_fields =  self._logic.getKeyFieldsFromFields(fields)
+    key_name = self._logic.getKeyNameFromFields(key_fields)
 
     # create new Role entity
     entity = self._logic.updateOrCreateFromKeyName(fields, key_name)
@@ -502,8 +502,8 @@
       return self.requestGet(request, context, params, **kwargs)
 
     # extract the key_name for the new request entity
-    key_fields = request_logic.logic.getKeyFieldsFromDict(request_fields)
-    key_name = request_logic.logic.getKeyNameForFields(key_fields)
+    key_fields = request_logic.logic.getKeyFieldsFromFields(request_fields)
+    key_name = request_logic.logic.getKeyNameFromFields(key_fields)
 
     # create the request entity
     entity = request_logic.logic.updateOrCreateFromKeyName(request_fields, key_name)