Merge pull request OpenUserJS#697 from Martii/Issue-490patchRemoverName

Patch for searching remover and reason in graveyard

Auto-merge

Author: Martii

controllers/user.js

@@ -1214,7 +1214,7 @@ function getExistingScript(aReq, aOptions, aAuthedUser, aCallback) {
           collaborators = [collaborators];
         }
       } else {
-        collaborators = []; // WATCHPOINT
+        collaborators = []; // NOTE: Watchpoint
       }
 
       aStream.on('data', function (aData) { bufs.push(aData); });

libs/modelQuery.js

@@ -90,14 +90,14 @@ var parseModelListSearchQuery = function (aModelListQuery, aQuery, aSearchOption
 var parseScriptSearchQuery = function (aScriptListQuery, aQuery) {
   parseModelListSearchQuery(aScriptListQuery, aQuery, {
     partialWordMatchFields: ['name', 'author', 'about', 'meta.description'],
-    fullWordMatchFields: ['meta.include', 'meta.match'],
+    fullWordMatchFields: ['meta.include', 'meta.match']
   });
 };
 exports.parseScriptSearchQuery = parseScriptSearchQuery;
 
 var parseGroupSearchQuery = function (aGroupListQuery, aQuery) {
   parseModelListSearchQuery(aGroupListQuery, aQuery, {
-    partialWordMatchFields: ['name'],
+    partialWordMatchFields: ['name']
     fullWordMatchFields: [],
   });
 };
@@ -106,31 +106,38 @@ exports.parseGroupSearchQuery = parseGroupSearchQuery;
 var parseDiscussionSearchQuery = function (aDiscussionListQuery, aQuery) {
   parseModelListSearchQuery(aDiscussionListQuery, aQuery, {
     partialWordMatchFields: ['topic'],
-    fullWordMatchFields: ['author'],
+    fullWordMatchFields: ['author']
   });
 };
 exports.parseDiscussionSearchQuery = parseDiscussionSearchQuery;
 
 var parseCommentSearchQuery = function (aCommentListQuery, aQuery) {
   parseModelListSearchQuery(aCommentListQuery, aQuery, {
     partialWordMatchFields: ['content'],
-    fullWordMatchFields: ['author'],
+    fullWordMatchFields: ['author']
   });
 };
 exports.parseCommentSearchQuery = parseCommentSearchQuery;
 
 var parseUserSearchQuery = function (aUserListQuery, aQuery) {
   parseModelListSearchQuery(aUserListQuery, aQuery, {
     partialWordMatchFields: ['name'],
-    fullWordMatchFields: [],
+    fullWordMatchFields: []
   });
 };
 exports.parseCommentSearchQuery = parseCommentSearchQuery;
 
 var parseRemovedItemSearchQuery = function (aRemovedItemListQuery, aQuery) {
   parseModelListSearchQuery(aRemovedItemListQuery, aQuery, {
-    partialWordMatchFields: ['content.*'],
-    fullWordMatchFields: ['model'],
+    partialWordMatchFields: [
+      'removerName',
+      'reason',
+
+      'content.*', // NOTE: Watchpoint... Wildcards don't appear to work (yet?)...
+      'content.name', // NOTE: ... instead use some exact key names. See #490
+      'content.author'
+    ],
+    fullWordMatchFields: ['model']
   });
 };
 exports.parseCommentSearchQuery = parseCommentSearchQuery;