Skip to content

Fix authors with mail and homepage #1693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Oct 12, 2016
Merged

Fix authors with mail and homepage #1693

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b131494
Fix authors that have a mail or homepage
nickvergessen Oct 11, 2016
d511acd
Better search functionality
nickvergessen Oct 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 46 additions & 6 deletions settings/js/apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,15 @@ OC.Settings.Apps = OC.Settings.Apps || {
}

if (_.isArray(app.author)) {
app.author = app.author.join(', ');
var authors = [];
_.each(app.author, function (author) {
if (typeof author === 'string') {
authors.push(author);
} else {
authors.push(author['@value']);
}
});
app.author = authors.join(', ');
}

var html = template(app);
Expand Down Expand Up @@ -486,6 +494,24 @@ OC.Settings.Apps = OC.Settings.Apps || {
);
},

/**
* Splits the query by spaces and tries to find all substring in the app
* @param {string} string
* @param {string} query
* @returns {boolean}
*/
_search: function(string, query) {
var keywords = query.split(' '),
stringLower = string.toLowerCase(),
found = true;

_.each(keywords, function(keyword) {
found = found && stringLower.indexOf(keyword) !== -1;
});

return found;
},

filter: function(query) {
var $appList = $('#apps-list'),
$emptyList = $('#apps-list-empty');
Expand All @@ -502,25 +528,39 @@ OC.Settings.Apps = OC.Settings.Apps || {

// App Name
var apps = _.filter(OC.Settings.Apps.State.apps, function (app) {
return app.name.toLowerCase().indexOf(query) !== -1;
return OC.Settings.Apps._search(app.name, query);
});

// App ID
apps = apps.concat(_.filter(OC.Settings.Apps.State.apps, function (app) {
return app.id.toLowerCase().indexOf(query) !== -1;
return OC.Settings.Apps._search(app.id, query);
}));

// App Description
apps = apps.concat(_.filter(OC.Settings.Apps.State.apps, function (app) {
return app.description.toLowerCase().indexOf(query) !== -1;
return OC.Settings.Apps._search(app.description, query);
}));

// Author Name
apps = apps.concat(_.filter(OC.Settings.Apps.State.apps, function (app) {
if (_.isArray(app.author)) {
return app.author.join(', ').toLowerCase().indexOf(query) !== -1;
var authors = [];
_.each(app.author, function (author) {
if (typeof author === 'string') {
authors.push(author);
} else {
authors.push(author['@value']);
if (!_.isUndefined(author['@attributes']['homepage'])) {
authors.push(author['@attributes']['homepage']);
}
if (!_.isUndefined(author['@attributes']['mail'])) {
authors.push(author['@attributes']['mail']);
}
}
});
return OC.Settings.Apps._search(authors.join(' '), query);
}
return app.author.toLowerCase().indexOf(query) !== -1;
return OC.Settings.Apps._search(app.author, query);
}));

// App status
Expand Down