diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-01 11:04:24 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-01 11:44:31 +0200 |
| commit | d590f0f39f0fdb266cb597f4e504f96f88e055c1 (patch) | |
| tree | 8a4e539ccdf1ccce6fc4a807b2753a8dacdbaa3c /archaeological_files | |
| parent | ecd99323f6dc851d69020e4430e6edf0ba1bb8a0 (diff) | |
| download | Ishtar-d590f0f39f0fdb266cb597f4e504f96f88e055c1.tar.bz2 Ishtar-d590f0f39f0fdb266cb597f4e504f96f88e055c1.zip | |
Title types can be set in administration.
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/data_importer.py | 4 | ||||
| -rw-r--r-- | archaeological_files/models.py | 4 | ||||
| -rw-r--r-- | archaeological_files/tests.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/archaeological_files/data_importer.py b/archaeological_files/data_importer.py index ba92c63ab..96b2ee007 100644 --- a/archaeological_files/data_importer.py +++ b/archaeological_files/data_importer.py @@ -23,7 +23,7 @@ import unicodecsv from django.conf import settings from ishtar_common.data_importer import * -from ishtar_common.models import Person, OrganizationType +from ishtar_common.models import OrganizationType from archaeological_operations.data_importer import * @@ -113,7 +113,7 @@ class FileImporterSraPdL(FilePostProcessing, Importer): None, # D, 4 ImportFormater( "general_contractor__title", # E, 5 - StrChoiceFormater(Person.TYPE, cli=True), + TypeFormater(models.TitleType), required=False, comment=u"Aménageur - titre"), None, # F, 6 diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 1cfbe35d3..98223d7ff 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -30,7 +30,7 @@ from ishtar_common.utils import cached_label_changed, get_cache from ishtar_common.models import GeneralType, BaseHistorizedItem, \ HistoricalRecords, OwnPerms, Person, Organization, Department, Town, \ - Dashboard, DashboardFormItem, IshtarUser, ValueGetter, ShortMenuItem, \ + Dashboard, DashboardFormItem, ValueGetter, ShortMenuItem, \ OperationType, get_external_id from archaeological_operations.models import get_values_town_related, \ @@ -243,7 +243,7 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, if self.general_contractor: if self.general_contractor.name: address = u" ".join([ - getattr(self.general_contractor, key) + unicode(getattr(self.general_contractor, key)) for key in ('title', 'surname', 'name') if getattr(self.general_contractor, key)]) elif self.general_contractor.raw_name: diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py index 030bc1624..63b8550e2 100644 --- a/archaeological_files/tests.py +++ b/archaeological_files/tests.py @@ -50,7 +50,7 @@ class FileInit(object): self.extra_models['person_type'] = person_type self.model_list.append(person_type) - person = models.Person(title='Mr', surname='Surname', name='Name', + person = models.Person(surname='Surname', name='Name', history_modifier=self.o_user) person.save() self.extra_models['person'] = person |