Skip to content

Commit 10d4030

Browse files
mchapmanmchapman
committed
fix(search) Do not preserve spaces when searching a single model (could feasibly but this under a url query flag)
1 parent b79a48c commit 10d4030

File tree

5 files changed

+13
-19
lines changed

5 files changed

+13
-19
lines changed

‎dist/forms-angular.js

Lines changed: 5 additions & 2 deletions
Large diffs are not rendered by default.

‎dist/forms-angular.min.js

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/forms-angular.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/data_form.js

Lines changed: 2 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/data_form.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -286,13 +286,8 @@ DataForm.prototype.internalSearch = function (req, resourcesToSearch, includeRes
286286
moreCount = 0,
287287
searchCriteria;
288288

289-
if (req.route && req.route.path === '/api/search') {
290-
// Called from search box - treat words as separate strings
291-
searchCriteria = {$regex: '^(' + searchFor.split(' ').join('|') + ')', $options: 'i'};
292-
} else {
293-
// called from somewhere else (probably select2 ajax) preserve spaces
294-
searchCriteria = {$regex: '^' + searchFor, $options: 'i'};
295-
}
289+
// Removed the logic that preserved spaces when collection was specified because Louise asked me to.
290+
searchCriteria = {$regex: '^(' + searchFor.split(' ').join('|') + ')', $options: 'i'};
296291

297292
this.searchFunc(
298293
searches,

0 commit comments

Comments
 (0)