From 9db7d3b85dccbb68546f670a53620be3dd8bd8f7 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 19 May 2015 11:32:12 -0400
Subject: [PATCH] (fix) Show/save whitelisted users for invitations

---
 .../js/Preferences/Preferences.service.js         | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index 2a6c682f3..6d1a4a167 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -40,12 +40,11 @@
 
     Preferences.$$resource.fetch("jsonSettings").then(function(data) {
       Preferences.$timeout(function() {
-
-
         // We convert our PreventInvitationsWhitelist hash into a array of user
         if (data.Calendar && data.Calendar.PreventInvitationsWhitelist)
           data.Calendar.PreventInvitationsWhitelist = _.map(data.Calendar.PreventInvitationsWhitelist, function(value, key) {
-            return new Preferences.$User({uid: key, shortFormat: value});
+            var match = /^(.+)\s<(\S+)>$/.exec(value);
+            return new Preferences.$User({uid: key, cn: match[1], c_email: match[2]});
           });
         else
           data.Calendar.PreventInvitationsWhitelist = [];
@@ -85,11 +84,8 @@
    */
   Preferences.prototype.$save = function() {
     var _this = this;
-    console.debug("save in model...");
 
-    return Preferences.$$resource.save("Preferences",
-                                       this.$omit(),
-                                       undefined)
+    return Preferences.$$resource.save("Preferences", this.$omit(true))
       .then(function(data) {
         // Make a copy of the data for an eventual reset
         //_this.$shadowData = _this.$omit(true);
@@ -133,10 +129,9 @@
     if (preferences.settings.Calendar && preferences.settings.Calendar.PreventInvitationsWhitelist) {
       var h = {};
       _.each(preferences.settings.Calendar.PreventInvitationsWhitelist, function(user) {
-        h[user.uid] = user.$$shortFormat;
-
-        preferences.settings.Calendar.PreventInvitationsWhitelist = h;
+        h[user.uid] = user.$shortFormat();
       });
+      preferences.settings.Calendar.PreventInvitationsWhitelist = h;
     }
 
     return preferences;