2 files changed, 37 insertions, 16 deletions
diff --git a/app/Formatter/GroupAutoCompleteFormatter.php b/app/Formatter/GroupAutoCompleteFormatter.php
index d811de7f..9d740b7f 100644
--- a/app/Formatter/GroupAutoCompleteFormatter.php
+++ b/app/Formatter/GroupAutoCompleteFormatter.php
@@ -4,12 +4,11 @@ namespace Kanboard\Formatter;
 
 use Kanboard\Core\Filter\FormatterInterface;
 use Kanboard\Core\Group\GroupProviderInterface;
-use PicoDb\Table;
 
 /**
  * Auto-complete formatter for groups
  *
- * @package  formatter
+ * @package  Kanboard\Formatter
  * @author   Frederic Guillot
  */
 class GroupAutoCompleteFormatter extends BaseFormatter implements FormatterInterface
diff --git a/app/Formatter/UserAutoCompleteFormatter.php b/app/Formatter/UserAutoCompleteFormatter.php
index c81af00a..aa02cd22 100644
--- a/app/Formatter/UserAutoCompleteFormatter.php
+++ b/app/Formatter/UserAutoCompleteFormatter.php
@@ -2,37 +2,59 @@
 
 namespace Kanboard\Formatter;
 
-use Kanboard\Model\UserModel;
+use Kanboard\Core\User\UserProviderInterface;
 use Kanboard\Core\Filter\FormatterInterface;
 
 /**
- * Auto-complete formatter for user filter
+ * Auto-complete formatter for users
  *
- * @package  formatter
+ * @package  Kanboard\Formatter
  * @author   Frederic Guillot
  */
 class UserAutoCompleteFormatter extends BaseFormatter implements FormatterInterface
 {
     /**
-     * Format the tasks for the ajax auto-completion
+     * Users found
+     *
+     * @access protected
+     * @var UserProviderInterface[]
+     */
+    protected $users;
+
+    /**
+     * Set users
+     *
+     * @access public
+     * @param  UserProviderInterface[] $users
+     * @return $this
+     */
+    public function withUsers(array $users)
+    {
+        $this->users = $users;
+        return $this;
+    }
+
+    /**
+     * Format the users for the ajax auto-completion
      *
      * @access public
      * @return array
      */
     public function format()
     {
-        $users = $this->query->columns(UserModel::TABLE.'.id', UserModel::TABLE.'.username', UserModel::TABLE.'.name')->findAll();
+        $result = array();
 
-        foreach ($users as &$user) {
-            if (empty($user['name'])) {
-                $user['value'] = $user['username'].' (#'.$user['id'].')';
-                $user['label'] = $user['username'];
-            } else {
-                $user['value'] = $user['name'].' (#'.$user['id'].')';
-                $user['label'] = $user['name'].' ('.$user['username'].')';
-            }
+        foreach ($this->users as $user) {
+            $result[] = array(
+                'id' => $user->getInternalId(),
+                'username' => $user->getUsername(),
+                'external_id' => $user->getExternalId(),
+                'external_id_column' => $user->getExternalIdColumn(),
+                'value' => $user->getName() === '' ? $user->getUsername() : $user->getName(),
+                'label' => $user->getName() === '' ? $user->getUsername() : $user->getName().' ('.$user->getUsername().')',
+            );
         }
 
-        return $users;
+        return $result;
     }
 }