From d159e12b3f963099652eaa15d100adb9c7c56259 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 27 May 2015 14:59:49 -0400
Subject: [PATCH] (js) Improve contact chips in Preferences module

Exclude users already in the prevent invitations whitelist.
---
 UI/Templates/PreferencesUI/UIxPreferences.wox |  2 +-
 .../js/Common/User.service.js                 | 19 +++++++++++++++----
 .../js/Preferences/PreferencesController.js   |  4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 1ac63c2c1..80e46c24a 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -459,7 +459,7 @@
                 </label>
                 <md-contact-chips
                     ng-model="app.preferences.settings.Calendar.PreventInvitationsWhitelist"
-                    md-contacts="app.userFilter($query)"
+                    md-contacts="app.userFilter($query, app.preferences.settings.Calendar.PreventInvitationsWhitelist)"
                     md-contact-name="cn"
                     md-contact-image="$$image"
                     md-contact-email="c_email"
diff --git a/UI/WebServerResources/js/Common/User.service.js b/UI/WebServerResources/js/Common/User.service.js
index 3066c24c0..64015596e 100644
--- a/UI/WebServerResources/js/Common/User.service.js
+++ b/UI/WebServerResources/js/Common/User.service.js
@@ -40,7 +40,7 @@
    * @param {string} search - a string used to performed the search
    * @return a promise of an array of matching User objects
    */
-  User.$filter = function(search) {
+  User.$filter = function(search, excludedUsers) {
     var deferred = User.$q.defer(),
         param = {search: search};
 
@@ -62,9 +62,20 @@
     User.$query = search;
 
     User.$$resource.fetch(null, 'usersSearch', param).then(function(response) {
-      var index, user;
+      var results, index, user;
+      if (excludedUsers) {
+        // Remove excluded users from response
+        results = _.filter(response.users, function(data) {
+          return !_.find(excludedUsers, function(user) {
+            return user.uid == data.uid;
+          });
+        });
+      }
+      else {
+        results = response.users;
+      }
       // Add new users matching the search query
-      angular.forEach(response.users, function(data) {
+      angular.forEach(results, function(data) {
         if (!_.find(User.$users, function(user) {
           return user.uid == data.uid;
         })) {
@@ -76,7 +87,7 @@
       // Remove users that no longer match the search query
       for (index = User.$users.length - 1; index >= 0; index--) {
         user = User.$users[index];
-        if (!_.find(response.users, function(data) {
+        if (!_.find(results, function(data) {
           return user.uid == data.uid;
         })) {
           User.$users.splice(index, 1);
diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index 2f1e23b94..035fbb40a 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -145,8 +145,8 @@
       vm.preferences.defaults.SOGoSieveFilters.splice(index, 1);
     }
 
-    function userFilter($query) {
-      User.$filter($query);
+    function userFilter($query, excludedUsers) {
+      User.$filter($query, excludedUsers);
       return User.$users;
     }