From dd5b3258644ebc025afa16b1f147d0a83506fd30 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 7 Jul 2015 16:34:58 -0400
Subject: [PATCH] (js) Simplify promises handling in User.$filter

---
 .../js/Common/User.service.js                 | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/UI/WebServerResources/js/Common/User.service.js b/UI/WebServerResources/js/Common/User.service.js
index 159ce5f90..2ca26c176 100644
--- a/UI/WebServerResources/js/Common/User.service.js
+++ b/UI/WebServerResources/js/Common/User.service.js
@@ -41,14 +41,12 @@
    * @return a promise of an array of matching User objects
    */
   User.$filter = function(search, excludedUsers) {
-    var deferred = User.$q.defer(),
-        param = {search: search};
+    var param = {search: search};
 
     if (!search) {
       // No query specified
       User.$users = [];
-      deferred.resolve(User.$users);
-      return deferred.promise;
+      return User.$q.when(User.$users);
     }
     if (angular.isUndefined(User.$users)) {
       // First session query
@@ -56,12 +54,11 @@
     }
     else if (User.$query == search) {
       // Query hasn't changed
-      deferred.resolve(User.$users);
-      return deferred.promise;
+      return User.$q.when(User.$users);
     }
     User.$query = search;
 
-    User.$$resource.fetch(null, 'usersSearch', param).then(function(response) {
+    return User.$$resource.fetch(null, 'usersSearch', param).then(function(response) {
       var results, index, user;
       if (excludedUsers) {
         // Remove excluded users from response
@@ -93,10 +90,9 @@
           User.$users.splice(index, 1);
         }
       }
-      deferred.resolve(User.$users);
-    }, deferred.reject);
-
-    return deferred.promise;
+      User.$log.debug(User.$users);
+      return User.$users;
+    });
   };
 
   /**
@@ -113,6 +109,10 @@
       this.$$image = this.image || User.$gravatar(this.c_email);
   };
 
+  User.prototype.toString = function() {
+    return '[User ' + this.c_email + ']';
+  };
+
   /**
    * @function $shortFormat
    * @memberof User.prototype