diff options
| -rw-r--r-- | archaeological_finds/admin.py | 4 | ||||
| -rw-r--r-- | archaeological_finds/data_importer.py | 6 | ||||
| -rw-r--r-- | archaeological_finds/tests.py | 14 |
3 files changed, 13 insertions, 11 deletions
diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py index 83ce7f666..a08fac41b 100644 --- a/archaeological_finds/admin.py +++ b/archaeological_finds/admin.py @@ -33,9 +33,9 @@ admin.site.register(models.BaseFind, BaseFindAdmin) class FindAdmin(HistorizedObjectAdmin): - list_display = ('label', 'dating', 'volume', 'weight', + list_display = ('label', 'datings', 'volume', 'weight', 'find_number',) - search_fields = ('label', "dating__period__label") + search_fields = ('label', "datings__period__label") model = models.Find admin.site.register(models.Find, FindAdmin) diff --git a/archaeological_finds/data_importer.py b/archaeological_finds/data_importer.py index a15b6bcc5..6046e44fd 100644 --- a/archaeological_finds/data_importer.py +++ b/archaeological_finds/data_importer.py @@ -47,7 +47,7 @@ class FindsImporterBibracte(Importer): # cf type None, # Type = sous classe de matériaux = Liste hiérarchique - ImportFormater('find__material_type', + ImportFormater('find__material_types', TypeFormater(models.MaterialType), required=False), # ??? None, @@ -77,7 +77,7 @@ class FindsImporterBibracte(Importer): ImportFormater('comment', UnicodeFormater(1000), required=False), # lien vers plusieurs chrono (voir gestion actuelle chrono) None, - # ImportFormater('find__dating__period', TypeFormater(Period, + # ImportFormater('find__datings__period', TypeFormater(Period, # many_split="&"), required=False), # topographic_localisation ImportFormater('topographic_localisation', UnicodeFormater(120), @@ -104,7 +104,7 @@ class FindAltImporterBibracte(Importer): ImportFormater('external_id', UnicodeFormater(120, notnull=True), duplicate_fields=[('find__external_id', False)]), # nature - ImportFormater('find__material_type', + ImportFormater('find__material_types', TypeFormater(models.MaterialType), required=False), # identifiant UE ImportFormater('context_record__external_id', UnicodeFormater(120),), diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index f61807637..34cacfe42 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -27,6 +27,7 @@ from archaeological_context_records.tests import ImportContextRecordTest from ishtar_common import forms_common + class ImportFindTest(ImportContextRecordTest): test_context_records = False @@ -40,12 +41,13 @@ class ImportFindTest(ImportContextRecordTest): old_nb = models.BaseFind.objects.count() MCC = ImporterType.objects.get(name=u"MCC - Mobilier") - mcc_file = open(settings.ROOT_PATH + \ - '../archaeological_finds/tests/MCC-finds-example.csv', 'rb') + mcc_file = open( + settings.ROOT_PATH + + '../archaeological_finds/tests/MCC-finds-example.csv', 'rb') file_dict = {'imported_file': SimpleUploadedFile(mcc_file.name, mcc_file.read())} - post_dict = {'importer_type':MCC.pk, 'skip_lines':1, - "encoding":'utf-8'} + post_dict = {'importer_type': MCC.pk, 'skip_lines': 1, + "encoding": 'utf-8'} form = forms_common.NewImportForm(data=post_dict, files=file_dict, instance=None) form.is_valid() @@ -56,7 +58,7 @@ class ImportFindTest(ImportContextRecordTest): # doing manual connections ceram = models.MaterialType.objects.get(txt_idx='ceramic').pk - self.setTargetKey('find__material_type', 'ceramique', ceram) + self.setTargetKey('find__material_types', 'ceramique', ceram) impt.importation() if not test: return @@ -64,4 +66,4 @@ class ImportFindTest(ImportContextRecordTest): current_nb = models.BaseFind.objects.count() self.assertTrue(current_nb == (old_nb + 4)) self.assertEqual( - models.Find.objects.filter(material_type__pk=ceram).count(), 4) + models.Find.objects.filter(material_types__pk=ceram).count(), 4) |