equal
deleted
inserted
replaced
107 if not all(kwargs.values()): |
107 if not all(kwargs.values()): |
108 #TODO: Change this into a proper redirect |
108 #TODO: Change this into a proper redirect |
109 return http.HttpResponseRedirect('/') |
109 return http.HttpResponseRedirect('/') |
110 |
110 |
111 try: |
111 try: |
112 key_fields = self._logic.getKeyFieldsFromDict(kwargs) |
112 key_fields = self._logic.getKeyFieldsFromFields(kwargs) |
113 entity = self._logic.getIfFields(key_fields) |
113 entity = self._logic.getFromKeyFieldsOr404(key_fields) |
114 except out_of_band.Error, error: |
114 except out_of_band.Error, error: |
115 return helper.responses.errorResponse( |
115 return helper.responses.errorResponse( |
116 error, request, template=params['error_public'], context=context) |
116 error, request, template=params['error_public'], context=context) |
117 |
117 |
118 self._public(request, entity, context) |
118 self._public(request, entity, context) |
166 if not all(kwargs.values()): |
166 if not all(kwargs.values()): |
167 #TODO: Change this into a proper redirect |
167 #TODO: Change this into a proper redirect |
168 return http.HttpResponseRedirect('/') |
168 return http.HttpResponseRedirect('/') |
169 |
169 |
170 try: |
170 try: |
171 key_fields = self._logic.getKeyFieldsFromDict(kwargs) |
171 key_fields = self._logic.getKeyFieldsFromFields(kwargs) |
172 entity = self._logic.getIfFields(key_fields) |
172 entity = self._logic.getFromKeyFieldsOr404(key_fields) |
173 except out_of_band.Error, error: |
173 except out_of_band.Error, error: |
174 return helper.responses.errorResponse( |
174 return helper.responses.errorResponse( |
175 error, request, template=params['error_export'], context=context) |
175 error, request, template=params['error_export'], context=context) |
176 |
176 |
177 self._export(request, entity, context) |
177 self._export(request, entity, context) |
258 context['page_name'] = page_name |
258 context['page_name'] = page_name |
259 entity = None |
259 entity = None |
260 |
260 |
261 try: |
261 try: |
262 if all(kwargs.values()): |
262 if all(kwargs.values()): |
263 key_fields = self._logic.getKeyFieldsFromDict(kwargs) |
263 key_fields = self._logic.getKeyFieldsFromFields(kwargs) |
264 entity = self._logic.getIfFields(key_fields) |
264 entity = self._logic.getFromKeyFieldsOr404(key_fields) |
265 except out_of_band.Error, error: |
265 except out_of_band.Error, error: |
266 if not seed: |
266 if not seed: |
267 error.message_fmt = ( |
267 error.message_fmt = ( |
268 error.message_fmt + self.DEF_CREATE_NEW_ENTITY_MSG_FMT % { |
268 error.message_fmt + self.DEF_CREATE_NEW_ENTITY_MSG_FMT % { |
269 'entity_type_lower' : params['name'].lower(), |
269 'entity_type_lower' : params['name'].lower(), |
318 key_name, fields = forms.collectCleanedFields(form) |
318 key_name, fields = forms.collectCleanedFields(form) |
319 |
319 |
320 self._editPost(request, entity, fields) |
320 self._editPost(request, entity, fields) |
321 |
321 |
322 if not key_name: |
322 if not key_name: |
323 key_fields = self._logic.getKeyFieldsFromDict(fields) |
323 key_fields = self._logic.getKeyFieldsFromFields(fields) |
324 key_name = self._logic.getKeyNameForFields(key_fields) |
324 key_name = self._logic.getKeyNameFromFields(key_fields) |
325 |
325 |
326 entity = self._logic.updateOrCreateFromKeyName(fields, key_name) |
326 entity = self._logic.updateOrCreateFromKeyName(fields, key_name) |
327 |
327 |
328 if not entity: |
328 if not entity: |
329 return http.HttpResponseRedirect('/') |
329 return http.HttpResponseRedirect('/') |
488 context = helper.responses.getUniversalContext(request) |
488 context = helper.responses.getUniversalContext(request) |
489 context['page_name'] = page_name |
489 context['page_name'] = page_name |
490 entity = None |
490 entity = None |
491 |
491 |
492 try: |
492 try: |
493 key_fields = self._logic.getKeyFieldsFromDict(kwargs) |
493 key_fields = self._logic.getKeyFieldsFromFields(kwargs) |
494 entity = self._logic.getIfFields(key_fields) |
494 entity = self._logic.getFromKeyFieldsOr404(key_fields) |
495 except out_of_band.Error, error: |
495 except out_of_band.Error, error: |
496 error.message_fmt = ( |
496 error.message_fmt = ( |
497 error.message_fmt + self.DEF_CREATE_NEW_ENTITY_MSG_FMT % { |
497 error.message_fmt + self.DEF_CREATE_NEW_ENTITY_MSG_FMT % { |
498 'entity_type_lower' : params['name'].lower(), |
498 'entity_type_lower' : params['name'].lower(), |
499 'entity_type' : params['name'], |
499 'entity_type' : params['name'], |