LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Improve contact chips in Preferences module 

Exclude users already in the prevent invitations whitelist.
pull/91/head
Francis Lachapelle 2015-05-27 14:59:49 -04:00
parent 28477e9709
commit d159e12b3f
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/Templates/PreferencesUI/UIxPreferences.wox
View File

@ -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"

19
UI/WebServerResources/js/Common/User.service.js
View File

@ -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);

4
UI/WebServerResources/js/Preferences/PreferencesController.js
View File

@ -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;
}