Skip to content
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

Issue 181 fix some mod searching #491

Merged
merged 3 commits into from
Dec 9, 2014
Merged

Issue 181 fix some mod searching #491

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82ef58c
Remember flagged state when searching on moderation pages; Fixes #181
jerone Dec 7, 2014
28fad7c
Finish off #489 for searching on some moderation pages
Dec 8, 2014
4bcc198
Change `placeholder` attribute for flagged items
Dec 8, 2014
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
34 changes: 22 additions & 12 deletions libs/modelQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ exports.findOrDefaultIfNull = findOrDefaultIfNull;
var orderDirs = ['asc', 'desc'];
var parseModelListSort = function (aModelListQuery, aOrderBy, aOrderDir, aDefaultSortFn) {
if (aOrderBy) {
if (_.isUndefined(aOrderDir) || !_.contains(orderDirs, aOrderDir))
if (_.isUndefined(aOrderDir) || !_.contains(orderDirs, aOrderDir)) {
aOrderDir = 'asc';
}

if (_.has(aModelListQuery.model.schema.paths, aOrderBy)) {
var sortBy = {};
Expand Down Expand Up @@ -135,7 +136,9 @@ var parseRemovedItemSearchQuery = function (aRemovedItemListQuery, aQuery) {
exports.parseCommentSearchQuery = parseCommentSearchQuery;

exports.applyDiscussionCategoryFilter = function (aDiscussionListQuery, aOptions, aCatergorySlug) {
if (aCatergorySlug === 'all') { return; }
if (aCatergorySlug === 'all') {
return;
}
if (aCatergorySlug === 'issues') {
aDiscussionListQuery.find({ issue: true });
} else {
Expand All @@ -148,15 +151,20 @@ var applyModelListQueryFlaggedFilter = function (aModelListQuery, aOptions, aFla
if (aOptions.isYou || aOptions.isMod) {
// Mod
if (aFlaggedQuery) {
if (aFlaggedQuery == 'true') {
aOptions.isFlagged = true;
if (aFlaggedQuery === 'true') {
if (!_.findWhere(aOptions.searchBarFormHiddenVariables, { name: 'flagged' })) {
aOptions.isFlagged = true;
aOptions.searchBarFormHiddenVariables.push({ name: 'flagged', value: 'true' });
aOptions.searchBarPlaceholder = aOptions.searchBarPlaceholder.replace(/^Search /, 'Search Flagged ');
}
aModelListQuery.and({ flags: { $gt: 0 } });
} else if (aFlaggedQuery == false) {
// aModelListQuery.and({$or: [
// {flags: {$exists: false}},
// {flags: {$lte: 0} },
// ]});
}
} else {
// Remove `flagged` form variable if present
aOptions.searchBarFormHiddenVariables = _.without(
aOptions.searchBarFormHiddenVariables,
_.findWhere(aOptions.searchBarFormHiddenVariables, { name: 'flagged', value: 'true' })
);
}
} else {
// Hide
Expand All @@ -172,16 +180,18 @@ var applyModelListQueryDefaults = function (aModelListQuery, aOptions, aReq, aDe
if (aReq.query.q) {
aOptions.searchBarValue = aReq.query.q;

if (aDefaultOptions.parseSearchQueryFn)
if (aDefaultOptions.parseSearchQueryFn) {
aDefaultOptions.parseSearchQueryFn(aModelListQuery, aReq.query.q);
}
}
aOptions.searchBarFormAction = aDefaultOptions.searchBarFormAction || '';
aOptions.searchBarPlaceholder = aDefaultOptions.searchBarPlaceholder || 'Search';
aOptions.searchBarFormHiddenVariables = aDefaultOptions.searchBarFormHiddenVariables || [];

// flagged
if (aDefaultOptions.filterFlaggedItems)
if (aDefaultOptions.filterFlaggedItems) {
applyModelListQueryFlaggedFilter(aModelListQuery, aOptions, aReq.query.flagged);
}

// Sort
parseModelListSort(aModelListQuery, aReq.query.orderBy, aReq.query.orderDir, function () {
Expand Down Expand Up @@ -246,7 +256,7 @@ var libraryListQueryDefaults = {
searchBarPlaceholder: 'Search Libraries',
searchBarFormAction: '/',
searchBarFormHiddenVariables: [
{ name: 'library', value: 'true' },
{ name: 'library', value: 'true' }
],
filterFlaggedItems: true
};
Expand Down