From 74dac71e8a2f3deb5cac24ebd1707bcc181a719f Mon Sep 17 00:00:00 2001
From: Tom Pipe <tompipe2008@gmail.com>
Date: Thu, 29 Oct 2015 11:31:53 +0000
Subject: [PATCH 1/2] Fixes U4-6167 - Show path of selected node

---
 .../propertyeditors/contentpicker/contentpicker.controller.js | 4 ++--
 .../views/propertyeditors/contentpicker/contentpicker.html    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 48f4ed5bda..8c271d096f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -150,7 +150,7 @@ function contentPickerController($scope, dialogService, entityResource, editorSt
 
         if (currIds.indexOf(item.id) < 0) {
             item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-            $scope.renderModel.push({ name: item.name, id: item.id, icon: item.icon });
+            $scope.renderModel.push({ name: item.name, id: item.id, icon: item.icon, path: item.path });
         }
     };
 
@@ -182,7 +182,7 @@ function contentPickerController($scope, dialogService, entityResource, editorSt
            
             if (entity) {
                 entity.icon = iconHelper.convertFromLegacyIcon(entity.icon);
-                $scope.renderModel.push({ name: entity.name, id: entity.id, icon: entity.icon });
+                $scope.renderModel.push({ name: entity.name, id: entity.id, icon: entity.icon, path: entity.path });
             }
             
            
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index c5de0a69db..1c0f19ca24 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -6,7 +6,7 @@
             ui-sortable
             ng-model="renderModel">
             	
-            <li ng-repeat="node in renderModel">
+            <li ng-repeat="node in renderModel" ng-attr-title="Path: {{node.path}}">
 
                 <i class="icon icon-navigation handle"></i>
 

From 2ae4ede258b2779ec1767d47dd0fa6b2c354555f Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Thu, 12 Nov 2015 10:55:00 +0100
Subject: [PATCH 2/2] Showing path when hovering nodes should be configurable
 on the content picker.

---
 .../contentpicker/contentpicker.controller.js                | 4 +++-
 .../views/propertyeditors/contentpicker/contentpicker.html   | 5 +----
 .../PropertyEditors/ContentPickerPropertyEditor.cs           | 5 ++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 8c271d096f..222c85fe4d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -49,7 +49,8 @@ function contentPickerController($scope, dialogService, entityResource, editorSt
     //the default pre-values
     var defaultConfig = {
         multiPicker: false,
-        showEditButton: false,        
+        showEditButton: false,
+        showPathOnHover: false,
         startNode: {
             query: "",
             type: "content",
@@ -65,6 +66,7 @@ function contentPickerController($scope, dialogService, entityResource, editorSt
     //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that!
     $scope.model.config.multiPicker = ($scope.model.config.multiPicker === "1" ? true : false);
     $scope.model.config.showEditButton = ($scope.model.config.showEditButton === "1" ? true : false);
+    $scope.model.config.showPathOnHover = ($scope.model.config.showPathOnHover === "1" ? true : false);
 
     var entityType = $scope.model.config.startNode.type === "member"
         ? "Member"
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index 1c0f19ca24..68487ceb7a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -5,11 +5,8 @@
         <ul class="unstyled list-icons" 
             ui-sortable
             ng-model="renderModel">
-            	
-            <li ng-repeat="node in renderModel" ng-attr-title="Path: {{node.path}}">
-
+            <li ng-repeat="node in renderModel" ng-attr-title="{{model.config.showPathOnHover && 'Path: ' + node.path || undefined}}">
                 <i class="icon icon-navigation handle"></i>
-
                 <a href="#" prevent-default ng-click="remove($index)">
                     <i class="icon icon-delete red hover-show"></i>
                     <i class="{{node.icon}} hover-hide"></i> 
diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
index 1789c6dae6..7af05dc4c4 100644
--- a/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
@@ -13,7 +13,8 @@ namespace Umbraco.Web.PropertyEditors
             _internalPreValues = new Dictionary<string, object>
                 {                 
                     {"showEditButton", "0"},
-                    {"startNodeId", "-1"}
+                    {"startNodeId", "-1"},
+                    {"showPathOnHover", "0"}
                 };
         }
 
@@ -37,6 +38,8 @@ namespace Umbraco.Web.PropertyEditors
             [PreValueField("startNodeId", "Start node", "treepicker")]
             public int StartNodeId { get; set; }
 
+            [PreValueField("showPathOnHover", "Show path when hovering items", "boolean")]
+            public bool ShowPathOnHover { get; set; }
         }
     }
 }
\ No newline at end of file