jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: Quick Search supports shortcuts

Browse Source 
!/#/@ Shortcut Support
This commit is contained in:
Gary Sharp
2014-02-06 18:18:46 +11:00
parent cd31ba4a6c
commit 6d54f3f972
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/API/Controllers/SearchController.cs
+22 -15
View File
@@ -24,25 +24,32 @@ namespace Disco.Web.Areas.API.Controllers
IEnumerable<ISearchResultItem> results = Enumerable.Empty<ISearchResultItem>(); IEnumerable<ISearchResultItem> results = Enumerable.Empty<ISearchResultItem>();
if (Authorization.Has(Claims.Job.Search)) switch (Term[0])
{ {
var jobMatches = Search.SearchJobs(Database, Term, Limit); case '!': // Device Only
results = results.Concat(jobMatches);
}
if (Authorization.Has(Claims.User.Search))
{
var userMatches = Search.SearchUsers(Database, Term, Limit);
results = results.Concat(userMatches);
}
if (Authorization.Has(Claims.Device.Search)) if (Authorization.Has(Claims.Device.Search))
{ results = results.Concat(Search.SearchDevices(Database, Term.Substring(1), Limit));
var deviceMatches = Search.SearchDevices(Database, Term, Limit); break;
results = results.Concat(deviceMatches); case '#': // Job Only
if (Authorization.Has(Claims.Job.Search))
results = results.Concat(Search.SearchJobs(Database, Term.Substring(1), Limit));
break;
case '@': // User Only
if (Authorization.Has(Claims.User.Search))
results = results.Concat(Search.SearchUsers(Database, Term.Substring(1), Limit));
break;
default: // Search All
if (Authorization.Has(Claims.Job.Search))
results = results.Concat(Search.SearchJobs(Database, Term, Limit));
if (Authorization.Has(Claims.User.Search))
results = results.Concat(Search.SearchUsers(Database, Term, Limit));
if (Authorization.Has(Claims.Device.Search))
results = results.Concat(Search.SearchDevices(Database, Term, Limit));
break;
} }
results = results.OrderByDescending(i => i.ScoreValue.Score(Term, .5)).Take(Limit); results = results.OrderByDescending(i => i.ScoreValue.Score(Term)).Take(Limit);
return Json(results, JsonRequestBehavior.AllowGet); return Json(results, JsonRequestBehavior.AllowGet);
} }