diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-12 15:05:16 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-12 15:05:16 +0200 |
| commit | 9ad7082177fb9402723fe704c48d63e078e299a0 (patch) | |
| tree | 72fc70286340f5f6fd906fe8a2f781368f83612f /ishtar_common/models.py | |
| parent | 84480c3374eafc1c244d9e5491c2142b923e4267 (diff) | |
| download | Ishtar-9ad7082177fb9402723fe704c48d63e078e299a0.tar.bz2 Ishtar-9ad7082177fb9402723fe704c48d63e078e299a0.zip | |
Manual merge action (refs #3176)
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index f3f9f0778..9ec03b60e 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2220,7 +2220,7 @@ pre_delete.connect(pre_delete_import, sender=Import) class Organization(Address, Merge, OwnPerms, ValueGetter): - TABLE_COLS = ('name', 'organization_type',) + TABLE_COLS = ('name', 'organization_type', 'town') SHOW_URL = 'show-organization' name = models.CharField(_(u"Name"), max_length=500) organization_type = models.ForeignKey(OrganizationType, @@ -2298,7 +2298,7 @@ class Person(Address, Merge, OwnPerms, ValueGetter): ('Dr', _(u'Doctor')), ) TABLE_COLS = ('name', 'surname', 'raw_name', 'email', 'person_types_list', - 'attached_to') + 'attached_to', 'town') SHOW_URL = 'show-person' MODIFY_URL = 'person_modify' old_title = models.CharField(_(u"Title"), max_length=100, choices=TYPE, |