diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:10:59 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:10:59 +0200 |
| commit | 151e42654a4bcfcff408c7799db199c71e81b5c5 (patch) | |
| tree | 02786db1039902c7cc75f76aa7159829299970ac /archaeological_files/models.py | |
| parent | 661218e0acd24fc3bca76229b61d0cb91a54be1c (diff) | |
| parent | 5eb8667794636e379a8c324da46c617ad365747a (diff) | |
| download | Ishtar-151e42654a4bcfcff408c7799db199c71e81b5c5.tar.bz2 Ishtar-151e42654a4bcfcff408c7799db199c71e81b5c5.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_files/models.py')
| -rw-r--r-- | archaeological_files/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
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: |