--- a/app/soc/views/models/base.py Sat Jan 31 15:40:32 2009 +0000
+++ b/app/soc/views/models/base.py Sat Jan 31 15:41:45 2009 +0000
@@ -109,8 +109,8 @@
return http.HttpResponseRedirect('/')
try:
- key_fields = self._logic.getKeyFieldsFromDict(kwargs)
- entity = self._logic.getIfFields(key_fields)
+ key_fields = self._logic.getKeyFieldsFromFields(kwargs)
+ entity = self._logic.getFromKeyFieldsOr404(key_fields)
except out_of_band.Error, error:
return helper.responses.errorResponse(
error, request, template=params['error_public'], context=context)
@@ -168,8 +168,8 @@
return http.HttpResponseRedirect('/')
try:
- key_fields = self._logic.getKeyFieldsFromDict(kwargs)
- entity = self._logic.getIfFields(key_fields)
+ key_fields = self._logic.getKeyFieldsFromFields(kwargs)
+ entity = self._logic.getFromKeyFieldsOr404(key_fields)
except out_of_band.Error, error:
return helper.responses.errorResponse(
error, request, template=params['error_export'], context=context)
@@ -260,8 +260,8 @@
try:
if all(kwargs.values()):
- key_fields = self._logic.getKeyFieldsFromDict(kwargs)
- entity = self._logic.getIfFields(key_fields)
+ key_fields = self._logic.getKeyFieldsFromFields(kwargs)
+ entity = self._logic.getFromKeyFieldsOr404(key_fields)
except out_of_band.Error, error:
if not seed:
error.message_fmt = (
@@ -320,8 +320,8 @@
self._editPost(request, entity, fields)
if not key_name:
- 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)
entity = self._logic.updateOrCreateFromKeyName(fields, key_name)
@@ -490,8 +490,8 @@
entity = None
try:
- key_fields = self._logic.getKeyFieldsFromDict(kwargs)
- entity = self._logic.getIfFields(key_fields)
+ key_fields = self._logic.getKeyFieldsFromFields(kwargs)
+ entity = self._logic.getFromKeyFieldsOr404(key_fields)
except out_of_band.Error, error:
error.message_fmt = (
error.message_fmt + self.DEF_CREATE_NEW_ENTITY_MSG_FMT % {