Load photos of LDAP-based address books in listing

Fixes #3942
This commit is contained in:
Francis Lachapelle
2016-12-15 10:18:28 -05:00
parent 15a3bf48d9
commit 651c0fdf14
4 changed files with 22 additions and 0 deletions

1
NEWS
View File

@@ -7,6 +7,7 @@ New features
Enhancements
- [web] prevent using localhost on additional IMAP accounts
- [web] renamed buttons of alarm toast (#3945)
- [web] load photos of LDAP-based address books in contacts list (#3942)
Bug fixes
- [core] honor blocking wrong login attemps within time interval (#2850)

View File

@@ -338,6 +338,10 @@
[newRecord setObject: data forKey: @"contactInfo"];
}
// photo => hasPhoto
data = [oldRecord objectForKey: @"photo"];
[newRecord setObject: [NSNumber numberWithInt: [data length] ? 1 : 0] forKey: @"hasPhoto"];
recordSource = [oldRecord objectForKey: @"source"];
if ([recordSource conformsToProtocol: @protocol (SOGoDNSource)] &&
[[(NSObject <SOGoDNSource>*) recordSource MSExchangeHostname] length])

View File

@@ -56,6 +56,21 @@
return new Resource(this._http, this._q, '/' + path.join('/'), this._activeUser);
};
/**
* @function path
* @memberof Resource.prototype
* @desc Create a URL of the resource context with any number of additional segments
* @return an absolute URL
*/
Resource.prototype.path = function() {
var path = [this._path];
if (arguments.length > 0)
Array.prototype.push.apply(path, Array.prototype.slice.call(arguments));
return path.join('/');
};
/**
* @function fetch
* @memberof Resource.prototype

View File

@@ -152,6 +152,8 @@
Card.$Preferences.avatar(this.$$email, 32, {no_404: true}).then(function(url) {
_this.$$image = url;
});
if (this.hasphoto)
this.photoURL = Card.$$resource.path(this.pid, this.id, 'photo');
if (this.isgroup)
this.c_component = 'vlist';
this.$avatarIcon = this.$isList()? 'group' : 'person';