Skip to content

[stable10] Fix multi translation names and descriptions #1688

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 5 commits into from
Oct 11, 2016
Merged

[stable10] Fix multi translation names and descriptions #1688

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ba5b97
Allow multiple names and description
nickvergessen Sep 30, 2016
96ed4fe
Fix displaying and searching with multiple authors
nickvergessen Sep 30, 2016
7d0d383
Fallback from "de" to "de_DE" and the other way around
nickvergessen Oct 4, 2016
7ce29c6
Fix authors that have a mail or homepage
nickvergessen Oct 11, 2016
d831156
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
Prev Previous commit
Better search functionality 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Oct 11, 2016
commit d831156d78d953ebc3cd16ea03f508649fdc1a9c
28 changes: 23 additions & 5 deletions settings/js/apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,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 @@ -510,17 +528,17 @@ 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
Expand All @@ -540,9 +558,9 @@ OC.Settings.Apps = OC.Settings.Apps || {
}
}
});
return authors.join(' ').toLowerCase().indexOf(query) !== -1;
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