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 | 01367ba32a282a439d72c3669613889c579aeb89 (patch) | |
| tree | 266baf5266b3efef0a8957b47e5fcbf234ba747e /archaeological_finds | |
| parent | bcc7c18b08411f7b4fc7a48e9cb13fa56cd23fa0 (diff) | |
| download | Ishtar-01367ba32a282a439d72c3669613889c579aeb89.tar.bz2 Ishtar-01367ba32a282a439d72c3669613889c579aeb89.zip | |
Preservation type disappearing (refs #3752)
Diffstat (limited to 'archaeological_finds')
| -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 |
3 files changed, 4 insertions, 4 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', |