From efc34658ecb63bf6386eb2da4729df1fd06b96ac Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 9 Mar 2016 16:08:51 -0500
Subject: [PATCH] (js) Fix handling of mail labels in Preferences

---
 NEWS                                                        | 1 +
 UI/Templates/PreferencesUI/UIxPreferences.wox               | 3 +--
 UI/WebServerResources/js/Preferences/Preferences.service.js | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index c949a11cc..a78291f10 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Enhancements
 Bug fixes
  - [web] fixed missing columns in SELECT statements (PostgreSQL)
  - [web] fixed display of ghosts when dragging events
+ - [web] fixed management of mail labels in Preferences module
 
 3.0.2 (2016-03-04)
 ------------------
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 75771a1d7..edbf437f3 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -690,8 +690,7 @@
                       id="mailLabelsView-content" class="md-padding">
             <md-list layout="row" layout-xs="column" layout-wrap="layout-wrap">
               <md-list-item flex="50" flex-xs="100"
-                            ng-repeat="(key, value) in
-                                       app.preferences.defaults.SOGoMailLabelsColors">
+                            ng-repeat="(key, value) in app.preferences.defaults.SOGoMailLabelsColors">
                 <sg-color-picker ng-model="value[1]"><!-- color picker--></sg-color-picker>
                 <md-input-container class="md-block md-flex">
 	          <input type="text"
diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index 9eb536b91..b0e6f46e0 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -15,7 +15,7 @@
 
     this.defaultsPromise = Preferences.$$resource.fetch("jsonDefaults").then(function(data) {
       // We swap $key -> _$key to avoid an Angular bug (https://github.com/angular/angular.js/issues/6266)
-      var labels = _.zipObject(_.map(data.SOGoMailLabelsColors, function(value, key) {
+      var labels = _.fromPairs(_.map(data.SOGoMailLabelsColors, function(value, key) {
         if (key.charAt(0) == '$')
           return ['_' + key, value];
         return [key, value];
@@ -197,7 +197,7 @@
     });
 
     // We swap _$key -> $key to avoid an Angular bug (https://github.com/angular/angular.js/issues/6266)
-    labels = _.zipObject(_.map(preferences.defaults.SOGoMailLabelsColors, function(value, key) {
+    labels = _.fromPairs(_.map(preferences.defaults.SOGoMailLabelsColors, function(value, key) {
       if (key.charAt(0) == '_' && key.charAt(1) == '$') {
         // New key, let's take the value and flatten it
         if (key.length > 2 && key.charAt(2) == '$') {