adjusted the user list screen to actually use the username instead of…

… the contact name resolves: http://bugs.web2project.net/view.php?id=1415
web2project · Nov 28, 2013 · 1963439 · 1963439
1 parent a91c78b
commit 1963439
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/classes/w2p/Output/HTMLHelper.class.php b/classes/w2p/Output/HTMLHelper.class.php
@@ -140,7 +140,7 @@ public function createCell($fieldName, $value, $custom = array()) {
                 $obj = new CContact();
                 $obj->findContactByUserid($this->tableRowData['user_id']);
                 $link = '?m=users&a=view&user_id='.$this->tableRowData['user_id'];
-                $cell = '<a href="'.$link.'">'.$obj->contact_display_name.'</a>';
+                $cell = '<a href="'.$link.'">'.$obj->user_username.'</a>';
                 break;
 //END: object-based linkings
 

diff --git a/modules/contacts/contacts.class.php b/modules/contacts/contacts.class.php
@@ -519,12 +519,13 @@ public static function getContactByUsername($username)
     public function findContactByUserid($userId)
     {
         $q = $this->_query;
-        $q->addTable('users');
-        $q->addQuery('con.*, contact_display_name as contact_name');
+        $q->addTable('users', 'u');
+        $q->addQuery('u.*, con.*, contact_display_name as contact_name');
         $q->addJoin('contacts', 'con', 'contact_id = user_contact', 'inner');
         $q->addWhere('user_id = ' . (int) $userId);
         $result = $q->loadHash();
 
+        $this->user_username = '';
         $this->bind($result);
 
         return $this;