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

Bug Fix: Job searching with username

Browse Source 
When searching jobs, the default domain is now assumed if none is
provided when checking for job users.
This commit is contained in:
Gary Sharp
2014-09-11 16:48:45 +10:00
parent 7551b39b8e
commit 4283b62803
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Searching/Search.cs
+10 -6
View File
@@ -22,6 +22,8 @@ namespace Disco.Services.Searching
IQueryable<Job> query = default(IQueryable<Job>); IQueryable<Job> query = default(IQueryable<Job>);
string userIdTerm = Term.Contains('\\') ? Term : ActiveDirectory.ParseDomainAccountId(Term);
if (int.TryParse(Term, out termInt)) if (int.TryParse(Term, out termInt))
{ {
// Term is a Number (int) // Term is a Number (int)
@@ -29,7 +31,7 @@ namespace Disco.Services.Searching
j.Id == termInt || j.Id == termInt ||
j.Device.SerialNumber.Contains(Term) || j.Device.SerialNumber.Contains(Term) ||
j.Device.AssetNumber.Contains(Term) || j.Device.AssetNumber.Contains(Term) ||
j.User.UserId == Term || j.User.UserId == userIdTerm ||
j.User.DisplayName.Contains(Term)); j.User.DisplayName.Contains(Term));
} }
else else
@@ -37,7 +39,7 @@ namespace Disco.Services.Searching
query = Database.Jobs.Where(j => query = Database.Jobs.Where(j =>
j.Device.SerialNumber.Contains(Term) || j.Device.SerialNumber.Contains(Term) ||
j.Device.AssetNumber.Contains(Term) || j.Device.AssetNumber.Contains(Term) ||
j.User.UserId == Term || j.User.UserId == userIdTerm ||
j.User.DisplayName.Contains(Term)); j.User.DisplayName.Contains(Term));
} }
@@ -65,6 +67,8 @@ namespace Disco.Services.Searching
IQueryable<Job> query = default(IQueryable<Job>); IQueryable<Job> query = default(IQueryable<Job>);
string userIdTerm = Term.Contains('\\') ? Term : ActiveDirectory.ParseDomainAccountId(Term);
if (int.TryParse(Term, out termInt)) if (int.TryParse(Term, out termInt))
{ {
// Term is a Number (int) // Term is a Number (int)
@@ -75,7 +79,7 @@ namespace Disco.Services.Searching
j.DeviceHeldLocation.Contains(Term) || j.DeviceHeldLocation.Contains(Term) ||
j.Device.SerialNumber.Contains(Term) || j.Device.SerialNumber.Contains(Term) ||
j.Device.AssetNumber.Contains(Term) || j.Device.AssetNumber.Contains(Term) ||
j.User.UserId == Term || j.User.UserId == userIdTerm ||
j.User.Surname.Contains(Term) || j.User.Surname.Contains(Term) ||
j.User.GivenName.Contains(Term) || j.User.GivenName.Contains(Term) ||
j.User.DisplayName.Contains(Term) || j.User.DisplayName.Contains(Term) ||
@@ -89,7 +93,7 @@ namespace Disco.Services.Searching
j.DeviceHeldLocation.Contains(Term) || j.DeviceHeldLocation.Contains(Term) ||
j.Device.SerialNumber.Contains(Term) || j.Device.SerialNumber.Contains(Term) ||
j.Device.AssetNumber.Contains(Term) || j.Device.AssetNumber.Contains(Term) ||
j.User.UserId == Term || j.User.UserId == userIdTerm ||
j.User.Surname.Contains(Term) || j.User.Surname.Contains(Term) ||
j.User.GivenName.Contains(Term) || j.User.GivenName.Contains(Term) ||
j.User.DisplayName.Contains(Term)); j.User.DisplayName.Contains(Term));
@@ -103,7 +107,7 @@ namespace Disco.Services.Searching
j.DeviceHeldLocation.Contains(Term) || j.DeviceHeldLocation.Contains(Term) ||
j.Device.SerialNumber.Contains(Term) || j.Device.SerialNumber.Contains(Term) ||
j.Device.AssetNumber.Contains(Term) || j.Device.AssetNumber.Contains(Term) ||
j.User.UserId == Term || j.User.UserId == userIdTerm ||
j.User.Surname.Contains(Term) || j.User.Surname.Contains(Term) ||
j.User.GivenName.Contains(Term) || j.User.GivenName.Contains(Term) ||
j.User.DisplayName.Contains(Term) || j.User.DisplayName.Contains(Term) ||
@@ -116,7 +120,7 @@ namespace Disco.Services.Searching
j.DeviceHeldLocation.Contains(Term) || j.DeviceHeldLocation.Contains(Term) ||
j.Device.SerialNumber.Contains(Term) || j.Device.SerialNumber.Contains(Term) ||
j.Device.AssetNumber.Contains(Term) || j.Device.AssetNumber.Contains(Term) ||
j.User.UserId == Term || j.User.UserId == userIdTerm ||
j.User.Surname.Contains(Term) || j.User.Surname.Contains(Term) ||
j.User.GivenName.Contains(Term) || j.User.GivenName.Contains(Term) ||
j.User.DisplayName.Contains(Term)); j.User.DisplayName.Contains(Term));