From 1f32fe964762aa047665901866b0bf6ff655ef43 Mon Sep 17 00:00:00 2001 From: Adam R Claxton Date: Sat, 22 Apr 2017 11:17:56 -0400 Subject: [PATCH] Device description and admin comments are no longer indexed by search bar; should alleviate wonky search results --- .../administration/adminDeviceSettings.jsp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/WebContent/html/webpages/administration/adminDeviceSettings.jsp b/WebContent/html/webpages/administration/adminDeviceSettings.jsp index b6a908f..476c6a3 100644 --- a/WebContent/html/webpages/administration/adminDeviceSettings.jsp +++ b/WebContent/html/webpages/administration/adminDeviceSettings.jsp @@ -415,13 +415,6 @@ function fuzzyFilter(deviceArray) for (var i = lockerFilterResults.length - 1; i >= 0; i--) { lockerFilterResults[i].original.locker=lockerFilterResults[i].string; } - ////// Eight pass: filter by Admin Comments - options.extract = function(arg) {return arg.admincomment;}; - var admincommentFilterResults = fuzzy.filter(searchText, deviceArray, options); - // replace releveant field with bolded string - for (var i = admincommentFilterResults.length - 1; i >= 0; i--) { - admincommentFilterResults[i].original.admincomment=admincommentFilterResults[i].string; - } ////// Ninth pass: filter by OS options.extract = function(arg) {return arg.os;}; var osFilterResults = fuzzy.filter(searchText, deviceArray, options); @@ -429,15 +422,8 @@ function fuzzyFilter(deviceArray) for (var i = osFilterResults.length - 1; i >= 0; i--) { osFilterResults[i].original.os=osFilterResults[i].string; } - ////// Tenth pass: filter by description - options.extract = function(arg) {return arg.description;}; - var descriptionFilterResults = fuzzy.filter(searchText, deviceArray, options); - // replace releveant field with bolded string - for (var i = descriptionFilterResults.length - 1; i >= 0; i--) { - descriptionFilterResults[i].original.description=descriptionFilterResults[i].string; - } - var filteredResults = union([nameFilterResults,macFilterResults,manufacturerFilterResults,hardwareFilterResults,modelFilterResults,serialFilterResults,lockerFilterResults,admincommentFilterResults,osFilterResults,descriptionFilterResults]); + var filteredResults = union([nameFilterResults,macFilterResults,manufacturerFilterResults,hardwareFilterResults,modelFilterResults,serialFilterResults,lockerFilterResults,osFilterResults]); // this returns a filtered array of objects with attributes 'index', 'original', 'score', and 'string' // I am interested in the 'original' attribute, which is the relevant object exactly as it was submitted,