yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

U4-2509 Umbraco backend search not working correctly with spaces - Also updated search.aspx dialog

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-10-06 16:55:54 +02:00
parent fd5de171c9
commit 3ff9d6adbc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs
View File

@@ -71,16 +71,19 @@ namespace umbraco.presentation.dialogs
}
else
{
var operation = criteria.Field("__nodeName", txt.MultipleCharacterWildcard());
var words = txt.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).Select(w => w.ToLower().MultipleCharacterWildcard()).ToList();
var operation = criteria.GroupedOr(new[] { "__nodeName" }, new[] { words[0] });
words.RemoveAt(0);
foreach (var word in words)
operation = operation.And().GroupedOr(new[] { "__nodeName" }, new[] { word });
// ensure the user can only find nodes they are allowed to see
if (CurrentUser.StartNodeId > 0)
if (UmbracoContext.Current.UmbracoUser.StartNodeId > 0)
{
operation = operation.And().Id(CurrentUser.StartNodeId);
operation = operation.And().Id(UmbracoContext.Current.UmbracoUser.StartNodeId);
}
results = internalSearcher.Search(operation.Compile());
}
nothingFound.Visible = !results.Any();