From d7481b5ca464b8c5c1091338c6408bf3c66661bc Mon Sep 17 00:00:00 2001 From: Murray Roke Date: Thu, 12 Sep 2013 10:22:59 +1200 Subject: [PATCH 1/6] Fix multiple words in search U4-2509 When multiple words are entered in the search field no results are returned. This pull req. contains the fix suggested by Tony. --- .../umbraco/Search/QuickSearchHandler.ashx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs index 23385d984b..cd63e2de0a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs @@ -59,7 +59,7 @@ namespace umbraco.presentation.umbraco.Search } else { - var operation = criteria.Field("__nodeName", txt.MultipleCharacterWildcard()); + var operation = criteria.Field("__nodeName", txt); // ensure the user can only find nodes they are allowed to see if (UmbracoContext.Current.UmbracoUser.StartNodeId > 0) From cf9f11ff45de13ca65c815044ea9c08ddb82f16b Mon Sep 17 00:00:00 2001 From: Murray Roke Date: Thu, 12 Sep 2013 13:22:14 +1200 Subject: [PATCH 2/6] Improved admin search splitting query U4-2509 --- .../umbraco/Search/QuickSearchHandler.ashx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs index cd63e2de0a..4cb18be507 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs @@ -59,7 +59,7 @@ namespace umbraco.presentation.umbraco.Search } else { - var operation = criteria.Field("__nodeName", txt); + var operation = criteria.GroupedAnd(new[] { "__nodeName" }, txt.Split(' ')); // ensure the user can only find nodes they are allowed to see if (UmbracoContext.Current.UmbracoUser.StartNodeId > 0) From a64efb93b3f8a69de6ec8189360a4a780be1dd45 Mon Sep 17 00:00:00 2001 From: Murray Roke Date: Thu, 12 Sep 2013 14:30:42 +1200 Subject: [PATCH 3/6] Improved search with "and", partial match U4-2509 - added partial matching on each word. - fixed bug so 'all' words match rather than 'any' words. --- .../umbraco/Search/QuickSearchHandler.ashx.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs index 4cb18be507..e98d99ae88 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs @@ -59,7 +59,11 @@ namespace umbraco.presentation.umbraco.Search } else { - var operation = criteria.GroupedAnd(new[] { "__nodeName" }, txt.Split(' ')); + 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 (UmbracoContext.Current.UmbracoUser.StartNodeId > 0) From 693778fe740f4785e11e71942fe9d70045e9ede8 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Wed, 2 Oct 2013 21:20:05 +0200 Subject: [PATCH 4/6] Fixed issue where member type properties would not persist after first save without reloading page --- .../umbraco.presentation/umbraco/members/EditMemberType.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx.cs index fe3fb9b0f7..94413d2fd2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx.cs @@ -64,7 +64,7 @@ namespace umbraco.cms.presentation.members } handled = true; } - setupExtraEditorControls(); + return handled; } private void setupExtraEditorControls(){ From b6cf18234178b9e96d2c203301a4abe648e3c080 Mon Sep 17 00:00:00 2001 From: wtct Date: Wed, 9 Oct 2013 17:52:05 +0200 Subject: [PATCH 5/6] Affect the order of domains --- src/umbraco.cms/businesslogic/web/Domain.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/umbraco.cms/businesslogic/web/Domain.cs b/src/umbraco.cms/businesslogic/web/Domain.cs index f5bcb46090..57156f0858 100644 --- a/src/umbraco.cms/businesslogic/web/Domain.cs +++ b/src/umbraco.cms/businesslogic/web/Domain.cs @@ -151,8 +151,7 @@ namespace umbraco.cms.businesslogic.web () => { var result = new List(); - using (var dr = SqlHelper.ExecuteReader( - "select id, domainName from umbracoDomains")) + using (var dr = SqlHelper.ExecuteReader("SELECT Id, DomainName FFROM umbracoDomains ORDER BY Id")) { while (dr.Read()) { From b5c3fb1728fde4862fff8c6c089296a4207da26a Mon Sep 17 00:00:00 2001 From: wtct Date: Fri, 11 Oct 2013 09:16:18 +0200 Subject: [PATCH 6/6] FFROM to FROM --- src/umbraco.cms/businesslogic/web/Domain.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/umbraco.cms/businesslogic/web/Domain.cs b/src/umbraco.cms/businesslogic/web/Domain.cs index 57156f0858..68268b9bb8 100644 --- a/src/umbraco.cms/businesslogic/web/Domain.cs +++ b/src/umbraco.cms/businesslogic/web/Domain.cs @@ -151,7 +151,7 @@ namespace umbraco.cms.businesslogic.web () => { var result = new List(); - using (var dr = SqlHelper.ExecuteReader("SELECT Id, DomainName FFROM umbracoDomains ORDER BY Id")) + using (var dr = SqlHelper.ExecuteReader("SELECT Id, DomainName FROM umbracoDomains ORDER BY Id")) { while (dr.Read()) {