Fix display of organizations in person tables

1 files changed, 10 insertions, 5 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 4f1168d39..1656b1e64 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2695,9 +2695,9 @@ class Person(Address, Merge, OwnPerms, ValueGetter):
         ('Dr', _(u'Doctor')),
     )
     TABLE_COLS = ('name', 'surname', 'raw_name', 'email', 'person_types_list',
-                  'attached_to__name', 'town')
+                  'attached_to', 'town')
     TABLE_COLS_ACCOUNT = ('name', 'surname', 'raw_name', 'email',
-                          'profiles_list', 'attached_to__name', 'town')
+                          'profiles_list', 'attached_to', 'town')
     SHOW_URL = 'show-person'
     MODIFY_URL = 'person_modify'
     BASE_SEARCH_VECTORS = ['name', 'surname', 'raw_name', 'town',
@@ -2706,11 +2706,11 @@ class Person(Address, Merge, OwnPerms, ValueGetter):
     # search parameters
     REVERSED_BOOL_FIELDS = ['ishtaruser__isnull']
     EXTRA_REQUEST_KEYS = {
-        'attached_to__name': 'attached_to__name',
         'ishtaruser__isnull': 'ishtaruser__isnull',
+        'attached_to': 'attached_to',
     }
     COL_LABELS = {
-        'attached_to__name': _(u"Organization")
+        'attached_to': _(u"Organization")
     }
 
     # alternative names of fields for searches
@@ -3092,7 +3092,7 @@ post_save.connect(post_save_userprofile, sender=UserProfile)
 class IshtarUser(FullSearch):
     TABLE_COLS = ('username', 'person__name', 'person__surname',
                   'person__email', 'person__person_types_list',
-                  'person__attached_to')
+                  'person__attached_to__name')
     BASE_SEARCH_VECTORS = [
         'user_ptr__username', 'person__name', 'person__surname',
         'person__email', 'person__town', 'person__attached_to__name']
@@ -3102,6 +3102,11 @@ class IshtarUser(FullSearch):
         'person__person_types_list': 'person__person_types__label'
     }
 
+    COL_LABELS = {
+        'person__attached_to__name': _(u"Organization"),
+        'username': _(u"Username")
+    }
+
     # alternative names of fields for searches
     ALT_NAMES = {
         'username': (