diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-13 12:31:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-13 12:31:51 +0200 |
| commit | 50162e444ac3f50194318338cfb3b1ad7480f9a8 (patch) | |
| tree | bfad38e1c51e88d95af4e2588ea7f34e567821bb /ishtar_common/models.py | |
| parent | 076ce993f1524d646fae406cb493661312260b20 (diff) | |
| parent | 4b7ee2dcb97a3b01670949a8de5ee6029c270f04 (diff) | |
| download | Ishtar-50162e444ac3f50194318338cfb3b1ad7480f9a8.tar.bz2 Ishtar-50162e444ac3f50194318338cfb3b1ad7480f9a8.zip | |
Merge branch 'master' into v0.9
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, |