amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-30 23:55:34 +00:00
Code Issues Projects Releases Wiki Activity

(js) Fix handling of prevent invitations whitelist

Browse Source
This commit is contained in:
Francis Lachapelle
2015-12-07 11:05:01 -05:00
parent a4bc4fc652
commit ecf297208a
4 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Common/User.service.js
+1 -1
View File
@@ -110,7 +110,7 @@
if (!this.$$shortFormat)
this.$$shortFormat = this.$shortFormat();
if (!this.$$image)
this.$$image = this.image || User.$gravatar(this.c_email);
this.$$image = this.image || User.$gravatar(this.c_email, 32, User.$alternateAvatar);
// An empty attribute to trick md-autocomplete when adding users from the ACLs editor
this.empty = ' ';
UI/WebServerResources/js/Preferences/Preferences.service.js
+5 -1
View File
@@ -52,11 +52,15 @@
this.settingsPromise = Preferences.$$resource.fetch("jsonSettings").then(function(data) {
// We convert our PreventInvitationsWhitelist hash into a array of user
if (data.Calendar && data.Calendar.PreventInvitationsWhitelist)
if (data.Calendar) {
if (data.Calendar.PreventInvitationsWhitelist)
data.Calendar.PreventInvitationsWhitelist = _.map(data.Calendar.PreventInvitationsWhitelist, function(value, key) {
var match = /^(.+)\s<(\S+)>$/.exec(value);
return new Preferences.$User({uid: key, cn: match[1], c_email: match[2]});
});
else
data.Calendar.PreventInvitationsWhitelist = [];
}
angular.extend(_this.settings, data);
UI/WebServerResources/js/Preferences/PreferencesController.js
+6
View File
@@ -49,6 +49,12 @@
}
});
// Set alternate avatar in User service
statePreferences.ready().then(function() {
if (statePreferences.defaults.SOGoAlternateAvatar)
User.$alternateAvatar = statePreferences.defaults.SOGoAlternateAvatar;
});
function go(module) {
$state.go('preferences.' + module);
}