diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-10 17:37:54 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-10 17:37:54 +0200 |
| commit | 434f2781e98654b56053082b178171224c87105b (patch) | |
| tree | 266baf5266b3efef0a8957b47e5fcbf234ba747e | |
| parent | 7af8207e1de9f23a9e17f7a81de85231bc87ef0b (diff) | |
| download | Ishtar-434f2781e98654b56053082b178171224c87105b.tar.bz2 Ishtar-434f2781e98654b56053082b178171224c87105b.zip | |
Preservation type disappearing (refs #3752)
| -rw-r--r-- | archaeological_finds/data_importer.py | 2 | ||||
| -rw-r--r-- | archaeological_finds/forms.py | 4 | ||||
| -rw-r--r-- | archaeological_finds/models.py | 2 | ||||
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 6 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/archaeological_finds/data_importer.py b/archaeological_finds/data_importer.py index 57b4e3927..e0c18d1bf 100644 --- a/archaeological_finds/data_importer.py +++ b/archaeological_finds/data_importer.py @@ -74,7 +74,7 @@ class FindsImporterBibracte(Importer): TypeFormater(models.ConservatoryState), required=False), # preservation_to_consider ImportFormater('find__preservation_to_considers', - TypeFormater(models.PreservationType), required=False), + TypeFormater(models.TreatmentType), required=False), # comment ImportFormater('comment', UnicodeFormater(1000), required=False), # lien vers plusieurs chrono (voir gestion actuelle chrono) diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 66ea273cf..aa0ae4621 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -437,9 +437,9 @@ class FindSelect(TableSelect): self.fields['checked'].choices = \ [('', '--')] + list(models.CHECK_CHOICES) self.fields['preservation_to_considers'].choices = \ - models.PreservationType.get_types() + models.TreatmentType.get_types() self.fields['preservation_to_considers'].help_text = \ - models.PreservationType.get_help() + models.TreatmentType.get_help() self.fields['integrities'].choices = \ models.IntegrityType.get_types() self.fields['integrities'].help_text = \ diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index f0dcf96c4..2f7c547b8 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -8,7 +8,7 @@ from archaeological_finds.models_treatments import Treatment, \ FindTreatments, TreatmentSource, TreatmentFile, TreatmentFileType, \ TreatmentFileSource, TreatmentState -__all__ = ['MaterialType', 'ConservatoryState', 'PreservationType', +__all__ = ['MaterialType', 'ConservatoryState', 'IntegrityType', 'RemarkabilityType', 'ObjectType', 'BaseFind', 'FindBasket', 'Find', 'FindSource', 'Property', 'BFBulkView', 'FBulkView', 'FirstBaseFindView', 'AlterationType', diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index c5ca39297..4386b6de7 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -3432,7 +3432,7 @@ "model": "ishtar_common.formatertype", "fields": { "formater_type": "TypeFormater", - "options": "archaeological_finds.models.PreservationType", + "options": "archaeological_finds.models.TreatmentType", "many_split": "&" } }, @@ -5312,7 +5312,7 @@ "regexp_filter": null, "formater_type": [ "TypeFormater", - "archaeological_finds.models.PreservationType", + "archaeological_finds.models.TreatmentType", "&" ], "force_new": false, @@ -7292,7 +7292,7 @@ "regexp_filter": null, "formater_type": [ "TypeFormater", - "archaeological_finds.models.PreservationType", + "archaeological_finds.models.TreatmentType", "&" ], "force_new": false, diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index d6106f33b..10e7be2e5 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -612,7 +612,7 @@ TARGET_MODELS = [ ('archaeological_finds.models.ConservatoryState', _(u"Conservatory state")), ('archaeological_warehouse.models.ContainerType', _(u"Container type")), - ('archaeological_finds.models.PreservationType', _(u"Preservation type")), + ('archaeological_finds.models.TreatmentType', _(u"Treatment type")), ('archaeological_finds.models.ObjectType', _(u"Object type")), ('archaeological_finds.models.IntegrityType', _(u"Integrity type")), ('archaeological_finds.models.RemarkabilityType', |