From 6b2cd476109f1841c1c1ffc1ae760a3e6e02287b Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Wed, 23 Apr 2014 13:20:03 +1000 Subject: [PATCH] Bug Fix: Targeted user search without domain If no domain is specified, the primary domain should be assumed --- Disco.Web/Controllers/SearchController.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Disco.Web/Controllers/SearchController.cs b/Disco.Web/Controllers/SearchController.cs index 3312233f..35ffb646 100644 --- a/Disco.Web/Controllers/SearchController.cs +++ b/Disco.Web/Controllers/SearchController.cs @@ -1,5 +1,6 @@ using Disco.Models.UI.Search; using Disco.Services.Authorization; +using Disco.Services.Interop.ActiveDirectory; using Disco.Services.Plugins.Features.UIExtension; using Disco.Services.Users; using Disco.Services.Web; @@ -203,6 +204,10 @@ namespace Disco.Web.Controllers } case "userid": Authorization.Require(Claims.User.Search); + + if (!term.Contains('\\')) + term = string.Format(@"{0}\{1}", ActiveDirectory.Context.PrimaryDomain.NetBiosName, term); + var user = Database.Users.FirstOrDefault(u => u.UserId == term); if (user != null) return RedirectToAction(MVC.User.Show(term));