diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-02 12:55:11 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-02 12:55:11 +0200 |
| commit | 5803cee0ebfb57779a21da987f0ca557a7c7bd39 (patch) | |
| tree | a81506ccdaa33521991843c4a79f45b7dd4f4edd | |
| parent | 528e51fc17ca9e90f0b3fa013f50cf985e77978f (diff) | |
| download | Ishtar-5803cee0ebfb57779a21da987f0ca557a7c7bd39.tar.bz2 Ishtar-5803cee0ebfb57779a21da987f0ca557a7c7bd39.zip | |
Context record wizard: fix creation
| -rw-r--r-- | archaeological_context_records/forms.py | 7 | ||||
| -rw-r--r-- | archaeological_operations/forms.py | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 77b42b609..0ecd5b28d 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -289,13 +289,6 @@ class RecordRelationsForm(OpeRecordRelationsForm): crs = None if 'data' in kwargs and 'CONTEXT_RECORDS' in kwargs['data']: crs = kwargs['data']['CONTEXT_RECORDS'] - # clean data if not "real" data - prefix_value = kwargs['prefix'] + '-right_record' - if not [k for k in kwargs['data'].keys() - if k.startswith(prefix_value) and kwargs['data'][k]]: - kwargs['data'] = None - if 'files' in kwargs: - kwargs.pop('files') super(RecordRelationsForm, self).__init__(*args, **kwargs) self.fields['relation_type'].choices = \ models.RelationType.get_types( diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 529a0c2fb..acd0fb099 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -417,7 +417,7 @@ class RecordRelationsForm(ManageOldType, forms.Form): raise forms.ValidationError( _(u"You should select a relation type.")) if self.left_record and \ - str(cleaned_data.get('right_record')) == str( + str(cleaned_data.get('right_record', None)) == str( self.left_record.pk): raise forms.ValidationError( _(u"An operation cannot be related to herself.")) |