Skip to content
Snippets Groups Projects
Commit 6202ef32 authored by Jörn Friedrich Dreyer's avatar Jörn Friedrich Dreyer
Browse files

use displayname lookup route in files_external settings

parent 91ba1b34
No related branches found
No related tags found
No related merge requests found
...@@ -233,41 +233,24 @@ $(document).ready(function() { ...@@ -233,41 +233,24 @@ $(document).ready(function() {
} }
}, },
initSelection: function(element, callback) { initSelection: function(element, callback) {
$.ajax(OC.generateUrl('displaynames'), {
var promises = [];
var results = [];
$(element.val().split(",")).each(function (i,userId) {
var def = new $.Deferred();
promises.push(def.promise());
var pos = userId.indexOf('(group)');
if (pos !== -1) {
//add as group
results.push({name:userId, displayname:userId.substr(0, pos), type:'group'});
def.resolve();
} else {
$.ajax(OC.generateUrl('apps/files_external/applicable'), {
data: { data: {
pattern: userId users: element.val().split(",")
}, },
dataType: "json" dataType: "json"
}).done(function(data) { }).done(function(data) {
var results = [];
if (data.status === "success") { if (data.status === "success") {
if (data.users[userId]) { $.each(data.users, function(user, displayname) {
results.push({name:userId, displayname:data.users[userId], type:'user'}); if (displayname !== false) {
results.push({name:user, displayname:displayname, type:'user'});
} }
def.resolve(); });
callback(results);
} else { } else {
//FIXME add error handling //FIXME add error handling
} }
}); });
}
});
$.when.apply(undefined, promises).then(function(){
callback(results);
});
}, },
id: function(element) { id: function(element) {
return element.name; return element.name;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment