From 702aa41ff2a8801c5f24976dc9ee103afb0f4754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <snielsen43@gmail.com>
Date: Wed, 9 Oct 2019 22:19:28 +0200
Subject: [PATCH 1/3] Adds nametemplates for grid editors

---
 .../Configuration/Grid/IGridEditorConfig.cs         |  1 +
 src/Umbraco.Core/PropertyEditors/GridEditor.cs      |  3 +++
 .../views/propertyeditors/grid/grid.controller.js   | 13 ++++++++++++-
 .../src/views/propertyeditors/grid/grid.html        |  4 ++--
 src/Umbraco.Web.UI/config/grid.editors.config.js    |  5 ++++-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/Grid/IGridEditorConfig.cs b/src/Umbraco.Core/Configuration/Grid/IGridEditorConfig.cs
index e447f7f493..9a11b0ef3e 100644
--- a/src/Umbraco.Core/Configuration/Grid/IGridEditorConfig.cs
+++ b/src/Umbraco.Core/Configuration/Grid/IGridEditorConfig.cs
@@ -6,6 +6,7 @@ namespace Umbraco.Core.Configuration.Grid
     public interface IGridEditorConfig
     {
         string Name { get; }
+        string NameTemplate { get; }
         string Alias { get; }
         string View { get; }
         string Render { get; }
diff --git a/src/Umbraco.Core/PropertyEditors/GridEditor.cs b/src/Umbraco.Core/PropertyEditors/GridEditor.cs
index 986eed9ccc..cc3561fbc2 100644
--- a/src/Umbraco.Core/PropertyEditors/GridEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/GridEditor.cs
@@ -18,6 +18,9 @@ namespace Umbraco.Core.PropertyEditors
         [JsonProperty("name", Required = Required.Always)]
         public string Name { get; set; }
 
+        [JsonProperty("nameTemplate")]
+        public string NameTemplate { get; set; }
+
         [JsonProperty("alias", Required = Required.Always)]
         public string Alias { get; set; }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index ccc390252b..0a4ab83dea 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -8,7 +8,8 @@ angular.module("umbraco")
             angularHelper,
             $element,
             eventsService,
-            editorService
+            editorService,
+            $interpolate
         ) {
 
             // Grid status variables
@@ -680,6 +681,11 @@ angular.module("umbraco")
                 $scope.showRowConfigurations = !$scope.showRowConfigurations;
             };
 
+            $scope.getTemplateName = function (control) {
+                if (control.editor.nameExp) return control.editor.nameExp(control)
+                return control.editor.name;
+            }
+
 
             // *********************************************
             // Initialization
@@ -923,6 +929,11 @@ angular.module("umbraco")
                     localizationService.localize("grid_" + value.alias, undefined, value.name).then(function (v) {
                         value.name = v;
                     });
+                    // setup nametemplate
+
+                    value.nameExp = !!value.nameTemplate
+                        ? $interpolate(value.nameTemplate)
+                        : undefined;
                 });
 
                 $scope.contentReady = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 6b739a9b86..3995ed703d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -182,7 +182,7 @@
                                                               <div class="umb-control-click-overlay" ng-show="control !== active && !sortMode"></div>
 
                                                               <div class="umb-control-collapsed umb-control-handle" ng-show="sortMode">
-                                                                  {{control.editor.name}}
+                                                                  {{ getTemplateName(control) }}
                                                               </div>
 
                                                               <div class="umb-control-inner" ng-hide="sortMode">
@@ -190,7 +190,7 @@
                                                                   <div class="umb-control-bar umb-control-handle">
 
                                                                       <div class="umb-control-title" ng-if="control === active">
-                                                                          {{control.editor.name}}
+                                                                          {{ getTemplateName(control) }}
                                                                       </div>
 
                                                                       <div class="umb-tools" ng-if="control === active">
diff --git a/src/Umbraco.Web.UI/config/grid.editors.config.js b/src/Umbraco.Web.UI/config/grid.editors.config.js
index 12fa726f21..49b843689b 100644
--- a/src/Umbraco.Web.UI/config/grid.editors.config.js
+++ b/src/Umbraco.Web.UI/config/grid.editors.config.js
@@ -7,12 +7,14 @@
     },
     {
         "name": "Image",
+        "nameTemplate": "{{ 'Image: ' + (value.udi | ncNodeName) }}",
         "alias": "media",
         "view": "media",
         "icon": "icon-picture"
     },
     {
         "name": "Macro",
+        "nameTemplate": "{{ 'Macro: ' + value.macroAlias }}",
         "alias": "macro",
         "view": "macro",
         "icon": "icon-settings-alt"
@@ -25,6 +27,7 @@
     },
     {
         "name": "Headline",
+        "nameTemplate": "{{ 'Headline: ' + value }}",
         "alias": "headline",
         "view": "textstring",
         "icon": "icon-coin",
@@ -43,4 +46,4 @@
             "markup": "<blockquote>#value#</blockquote>"
         }
     }
-]
\ No newline at end of file
+]

From f20394556cb59bafe5fbba30c5c60db7c1c31d1f Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Fri, 25 Oct 2019 11:58:04 +0200
Subject: [PATCH 2/3] Removed trailing newlines

---
 .../src/views/propertyeditors/grid/grid.controller.js           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index 0a4ab83dea..32f495e32b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -662,7 +662,6 @@ angular.module("umbraco")
                 return ((spans / $scope.model.config.items.columns) * 100).toFixed(8);
             };
 
-
             $scope.clearPrompt = function (scopedObject, e) {
                 scopedObject.deletePrompt = false;
                 e.preventDefault();
@@ -686,7 +685,6 @@ angular.module("umbraco")
                 return control.editor.name;
             }
 
-
             // *********************************************
             // Initialization
             // these methods are called from ng-init on the template

From 1c70d04ce29fd750055227cabac2bccd44cc1d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <snielsen43@gmail.com>
Date: Tue, 5 Nov 2019 15:33:07 +0100
Subject: [PATCH 3/3] Moves editor name part out of template. Adds null
 checking in templates

---
 .../src/views/propertyeditors/grid/grid.controller.js | 11 +++++++++--
 src/Umbraco.Web.UI/config/grid.editors.config.js      |  7 ++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index 32f495e32b..5dce84d5dc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -681,8 +681,15 @@ angular.module("umbraco")
             };
 
             $scope.getTemplateName = function (control) {
-                if (control.editor.nameExp) return control.editor.nameExp(control)
-                return control.editor.name;
+                var templateName = control.editor.name;
+                if (control.editor.nameExp) {
+                    var valueOfTemplate = control.editor.nameExp(control);
+                    if (valueOfTemplate != "") {
+                        templateName += ": ";
+                        templateName += valueOfTemplate;
+                    }
+                }
+                return templateName;
             }
 
             // *********************************************
diff --git a/src/Umbraco.Web.UI/config/grid.editors.config.js b/src/Umbraco.Web.UI/config/grid.editors.config.js
index 49b843689b..210d167f9e 100644
--- a/src/Umbraco.Web.UI/config/grid.editors.config.js
+++ b/src/Umbraco.Web.UI/config/grid.editors.config.js
@@ -7,14 +7,14 @@
     },
     {
         "name": "Image",
-        "nameTemplate": "{{ 'Image: ' + (value.udi | ncNodeName) }}",
+        "nameTemplate": "{{ value && value.udi ? (value.udi | ncNodeName) : '' }}",
         "alias": "media",
         "view": "media",
         "icon": "icon-picture"
     },
     {
         "name": "Macro",
-        "nameTemplate": "{{ 'Macro: ' + value.macroAlias }}",
+        "nameTemplate": "{{ value && value.macroAlias ? value.macroAlias : '' }}",
         "alias": "macro",
         "view": "macro",
         "icon": "icon-settings-alt"
@@ -27,7 +27,7 @@
     },
     {
         "name": "Headline",
-        "nameTemplate": "{{ 'Headline: ' + value }}",
+        "nameTemplate": "{{ value }}",
         "alias": "headline",
         "view": "textstring",
         "icon": "icon-coin",
@@ -38,6 +38,7 @@
     },
     {
         "name": "Quote",
+        "nameTemplate": "{{ value ? value.substring(0,32) + (value.length > 32 ? '...' : '') : '' }}",
         "alias": "quote",
         "view": "textstring",
         "icon": "icon-quote",