From 0e5f45823423ffc63efc9b963a04ab8ebcd35a2a Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 6 Sep 2016 11:06:13 +0200 Subject: Fix context records creation (refs #3080) --- archaeological_context_records/forms.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'archaeological_context_records/forms.py') diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 225b49bfb..daaf5f5ed 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -160,10 +160,24 @@ class RecordFormGeneral(ManageOldType, forms.Form): ('operation' in kwargs['data'] or 'context_record' in kwargs['data']): if 'operation' in kwargs['data']: - operation = kwargs['data']['operation'] + operation = kwargs['data'].pop('operation') + if type(operation) in (list, tuple): + operation = operation[0] + if not hasattr(operation, 'id'): + operation_id = operation + try: + operation = Operation.objects.get(pk=operation_id) + except Operation.DoesNotExist: + operation = None # force operation modification - kwargs['data'][kwargs['prefix'] + '-operation_id'] = \ - operation.id + # if posted + if operation and kwargs['data']: + if hasattr(operation, 'id'): + kwargs['data'][kwargs['prefix'] + '-operation_id'] = \ + operation.id + else: + kwargs['data'][kwargs['prefix'] + '-operation_id'] = \ + operation if 'context_record' in kwargs['data'] and \ kwargs['data']['context_record']: operation = kwargs['data']['context_record'].operation -- cgit v1.2.3