diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-11-15 16:29:30 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:23:19 +0100 |
| commit | cda77c979e232386ef24ea7a04600f16f3c32c98 (patch) | |
| tree | 7d53e762723338913594ccdb42c6fa08c4bfb5ef /ishtar_common | |
| parent | 4746cd2938df3cf87ae338d22eb4f67f35bac960 (diff) | |
| download | Ishtar-cda77c979e232386ef24ea7a04600f16f3c32c98.tar.bz2 Ishtar-cda77c979e232386ef24ea7a04600f16f3c32c98.zip | |
File module refactoring - more tests for files
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/admin.py | 2 | ||||
| -rw-r--r-- | ishtar_common/forms.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models.py | 4 | ||||
| -rw-r--r-- | ishtar_common/tests.py | 4 |
4 files changed, 2 insertions, 10 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 8e47b33b4..ee23a221e 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -74,7 +74,6 @@ from ishtar_common import forms as common_forms from ishtar_common.serializers import restore_serialized, IMPORT_MODEL_LIST from ishtar_common.serializers_utils import generic_get_results, serialization_info from archaeological_files import forms as file_forms -from archaeological_files_pdl import forms as file_pdl_forms from archaeological_operations import forms as operation_forms from archaeological_context_records import forms as context_record_forms from archaeological_finds import ( @@ -91,7 +90,6 @@ csrf_protect_m = method_decorator(csrf_protect) ISHTAR_FORMS = [ common_forms, - file_pdl_forms, file_forms, operation_forms, context_record_forms, diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index d15352e64..2e15e907c 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -273,8 +273,6 @@ class CustomForm(BSForm): :return: tuple of choices (id, value) """ app_name = cls.__module__.split(".")[0] - if app_name == "archaeological_files_pdl": - app_name = "archaeological_files" model_name = cls.form_slug.split("-")[0].replace("_", "") ct_class = apps.get_model(app_name, model_name) return ct_class._get_dynamic_choices(key) diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 4ccc1cc0f..727d77fbc 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1622,8 +1622,6 @@ class CustomForm(models.Model): for app_form in ISHTAR_FORMS: app_name = app_form.__package__ - if app_name == "archaeological_files_pdl": - app_name = "archaeological_files" for form in dir(app_form): if "Form" not in form and "Select" not in form: # not very clean... but do not treat inappropriate items @@ -1655,8 +1653,6 @@ class CustomForm(models.Model): return [] current_form = register[self.form] app_name = current_form.__module__.split(".")[0] - if app_name == "archaeological_files_pdl": - app_name = "archaeological_files" if app_name not in register_fields: return [] res = [] diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index f624314e0..d1e4c54b5 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -586,7 +586,7 @@ class WizardTest(object): response, "/{}/{}".format(self.url_uri, next_form), msg_prefix="Dataset n{} Redirection to {} has failed - " - "Error on previous form ({})?".format( + "Error on previous form ({})? Error on the wizard_name?\n".format( data_idx + 1, next_form, current_step ), ) @@ -595,7 +595,7 @@ class WizardTest(object): if not self.redirect_url: redirect_url = "/{}/done".format(self.url_uri) else: - dct = {"url_name": self.url_name, "url_uri": self.url_uri} + dct = {"url_name": self.url_name, "url_uri": self.url_uri, "last_id": 0} form_key = "selec-" + self.url_name if form_key in form_data and self.current_id_key in form_data[form_key]: dct["current_id"] = form_data[form_key][self.current_id_key] |