diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:44:05 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:44:05 +0200 |
| commit | c96cba070566ab4703504591a413b9c1e5106f3a (patch) | |
| tree | 34d3b440a0abefac2d3919aee4690c1ea1f704e5 /archaeological_files/models.py | |
| parent | 0f03de06a49675ef16cf5ed0a297524554e06525 (diff) | |
| parent | 4190b4a7dc03c0b9f1ca4113b4d0706c1bfffa19 (diff) | |
| download | Ishtar-c96cba070566ab4703504591a413b9c1e5106f3a.tar.bz2 Ishtar-c96cba070566ab4703504591a413b9c1e5106f3a.zip | |
Merge branch 'v0.9' into wheezy
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: |