diff options
| -rw-r--r-- | CHANGES.md | 7 | ||||
| -rw-r--r-- | archaeological_operations/tests.py | 23 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 2 | ||||
| -rw-r--r-- | ishtar_common/version.py | 4 |
4 files changed, 34 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md index 86834a40d..8ec170148 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,13 @@ date: 2022-06-02 Ishtar changelog ================ +v3.1.72 - 2022-06-02 +-------------------- + +### Bug fix ### + +- Import: fix default value for base item + v3.1.71 - 2022-06-02 -------------------- diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index a2c0ea70d..d579b2b6c 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -76,6 +76,7 @@ from ishtar_common.models import ( ValueFormater, Regexp, ) +from ishtar_common.models_imports import ImporterDefault, ImporterDefaultValues from archaeological_files.models import File, FileType from archaeological_context_records.models import Unit, ContextRecord @@ -433,6 +434,28 @@ class ImportOperationTest(ImportTest, TestCase): target.delete() col.delete() + def test_default_value(self): + importer, form = self.init_ope_import() + rs, __ = models.ReportState.objects.get_or_create( + label="Dans les limbes", txt_idx="in-limbo", order=10) + def_imp = ImporterDefault.objects.create(importer_type=importer, target="-") + ImporterDefaultValues.objects.create( + default_target=def_imp, + target="report_processing", + value=rs.txt_idx + ) + self.assertTrue(form.is_valid()) + impt = form.save(self.ishtar_user) + impt.initialize() + self.init_ope_targetkey(imp=impt) + impt.importation() + self.assertEqual( + models.Operation.objects.filter( + code_patriarche="4201", + report_processing__txt_idx=rs.txt_idx + ).count(), 1 + ) + def test_import_value_format(self): importer, form = self.init_ope_import() column = importer.columns.get(col_number=1) diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 7ddd31a49..694b0d17d 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -342,6 +342,8 @@ class ImporterDefault(models.Model): @property def associated_model(self): + if not self.keys: + return import_class(self.importer_type.associated_models.klass) return get_associated_model(self.importer_type.associated_models.klass, self.keys) diff --git a/ishtar_common/version.py b/ishtar_common/version.py index df9e55fb4..024ffd0b6 100644 --- a/ishtar_common/version.py +++ b/ishtar_common/version.py @@ -1,5 +1,5 @@ -# 3.1.71 -VERSION = (3, 1, 71) +# 3.1.72 +VERSION = (3, 1, 72) def get_version(): |