From 296adf70b492445304753a11a2339c217cffda27 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 21 Dec 2016 16:15:26 +0100 Subject: [PATCH 1/4] remove lorem ipsum --- .../common/overlays/insertfield/insertfield.controller.js | 5 ----- .../src/views/common/overlays/insertfield/insertfield.html | 2 -- 2 files changed, 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js index 06de14963e..141e7184f1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.controller.js @@ -37,11 +37,6 @@ $scope.model.title = "Insert value"; } - // set default subtitle - if(!$scope.model.subtitle) { - $scope.model.subtitle = "Lorem ipsum dolor sit amet, consectetur adipiscing elit."; - } - // Load all fields contentTypeResource.getAllPropertyTypeAliases().then(function (array) { vm.properties = array; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html index 773aebd364..161be5060a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html @@ -53,7 +53,6 @@
Yes, make it recursive @@ -87,7 +86,6 @@
Uppercase From d835008c67595543bde48862e3f3db4143c8da2a Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 22 Dec 2016 10:57:07 +0100 Subject: [PATCH 2/4] =?UTF-8?q?Fixes:=20U4-9275=20Show=20correct=20render?= =?UTF-8?q?=20section=20in=20=E2=80=9CSections=E2=80=9D=20dialog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templatesections/templatesections.controller.js | 6 +++--- .../common/overlays/templatesections/templatesections.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js index 31eeab0008..cb5da443b6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.controller.js @@ -19,10 +19,10 @@ function onInit() { - if($scope.model.isMasterTemplate) { - $scope.model.insertType = 'renderBody'; - } else { + if($scope.model.hasMaster) { $scope.model.insertType = 'addSection'; + } else { + $scope.model.insertType = 'renderBody'; } } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html index 2c3b7f0147..36af4a2798 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/templatesections/templatesections.html @@ -1,6 +1,6 @@
-
+
Render child template
@@ -9,7 +9,7 @@
-
+
Render a named section
From dea355388568e68b694162115adb89c5cfb7a09b Mon Sep 17 00:00:00 2001 From: mikkelhm Date: Wed, 28 Dec 2016 14:04:40 +0100 Subject: [PATCH 3/4] Change back to using CurrentPage.Site() when queuing with the Query Builder, as Model.Content.Site(), doesnt support the queries the Query Builder creates --- src/Umbraco.Web/Editors/TemplateQueryController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Editors/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQueryController.cs index a68c3bb9e0..487e5573bf 100644 --- a/src/Umbraco.Web/Editors/TemplateQueryController.cs +++ b/src/Umbraco.Web/Editors/TemplateQueryController.cs @@ -65,7 +65,7 @@ namespace Umbraco.Web.Editors var sb = new StringBuilder(); - sb.Append("Model.Content.Site()"); + sb.Append("CurrentPage.Site()"); var timer = new Stopwatch(); From 19f7e6bd88749f7a6ab38885c878e793eeaf07a4 Mon Sep 17 00:00:00 2001 From: mikkelhm Date: Wed, 28 Dec 2016 14:07:22 +0100 Subject: [PATCH 4/4] When Querying we need to use the Alias to search for, in stead of the name, this is due to names like "Created Date" and "Last Updated Date", who has aliases like "CreateDate", and "UpdateDate" --- src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs b/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs index 284518bf1e..8642a65a2e 100644 --- a/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs +++ b/src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs @@ -13,7 +13,7 @@ { private static string MakeBinaryOperation(this QueryCondition condition, string operand, int token) { - return string.Format("{0}{1}@{2}", condition.Property.Name, operand, token); + return string.Format("{0}{1}@{2}", condition.Property.Alias, operand, token); }