From bd0cceb517824574499f340fae5d993ade0035bd Mon Sep 17 00:00:00 2001
From: Zsolt <zla@umbraco.com>
Date: Tue, 15 Aug 2017 14:41:04 +0200
Subject: [PATCH] Clean-up with Mads

---
 .../prevalueeditors/mediapicker.controller.js     | 15 +++++++++++----
 .../src/views/prevalueeditors/mediapicker.html    | 10 ++++------
 .../prevalueeditors/treepicker.controller.js      | 15 ++++++++-------
 .../src/views/prevalueeditors/treepicker.html     | 10 ++++------
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
index e5f582ad12..a4dda97fe1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
@@ -9,6 +9,10 @@ function mediaPickerController($scope, dialogService, entityResource, $log, icon
 
     $scope.renderModel = [];   
 
+    $scope.allowRemove = true;
+    $scope.allowEdit = true;
+    $scope.sortable = false;
+
     var dialogOptions = {
         multiPicker: false,
         entityType: "Media",
@@ -90,13 +94,16 @@ function mediaPickerController($scope, dialogService, entityResource, $log, icon
     if (modelIds.length > 0) {
         entityResource.getByIds(modelIds, dialogOptions.entityType).then(function (data) {
             _.each(data, function (item, i) {
-                item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-                $scope.renderModel.push({ name: item.name, id: item.id, path: item.path, icon: item.icon, udi: item.udi });
+
+                entityResource.getUrl(item.id, "Media").then(function(data){
+                    item.path = data;
+                    item.icon = iconHelper.convertFromLegacyIcon(item.icon);
+                    $scope.renderModel.push({ name: item.name, id: item.id, path: item.path,  icon: item.icon, udi: item.udi });
+                });                
             });
         });
     }
-    
-    
+        
 }
 
 angular.module('umbraco').controller("Umbraco.PrevalueEditors.MediaPickerController",mediaPickerController);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
index 44987b3c9e..f8d780d3e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.html
@@ -1,18 +1,16 @@
 <div ng-controller="Umbraco.PrevalueEditors.MediaPickerController" class="umb-editor umb-contentpicker">
 
-	<div ui-sortable="sortableOptions" ng-model="renderModel">
+	<div ng-model="renderModel">
 		<umb-node-preview
 			ng-repeat="node in renderModel"
 			icon="node.icon"
 			name="node.name"
 			published="node.published"
 			description="node.path"
-			sortable="!sortableOptions.disabled"
-			allow-remove="remove"
-			allow-open="model.config.showOpenButton && allowOpenButton && !dialogEditor"
-			allow-edit=""
+			sortable="sortable"
+			allow-remove="allowRemove"
+			allow-edit="allowEdit"
 			on-remove="remove($index)"
-			on-open="openMiniEditor(node)"
 			on-edit="openContentPicker()">
 		</umb-node-preview>
 	</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js
index be9a24fbb7..8e0c68f1c1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js
@@ -7,6 +7,9 @@ angular.module('umbraco')
 		$scope.renderModel = [];
 		$scope.ids = [];
 
+		$scope.allowRemove = true;
+		$scope.allowEdit = true;
+		$scope.sortable = false;
 
 	    var config = {
 	        multiPicker: false,
@@ -25,8 +28,11 @@ angular.module('umbraco')
 			$scope.ids = $scope.model.value.split(',');
 			entityResource.getByIds($scope.ids, config.entityType).then(function (data) {
 			    _.each(data, function (item, i) {
-					item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-			        $scope.renderModel.push({ name: item.name, id: item.id, icon: item.icon, udi: item.udi });
+					entityResource.getUrl(item.id, "Document").then(function(data){
+						item.path = data;
+						item.icon = iconHelper.convertFromLegacyIcon(item.icon);		
+						$scope.renderModel.push({name: item.name, path: item.path, id: item.id, icon: item.icon, udi: item.udi});
+					}); 
 			    });
 			});
 		}
@@ -45,11 +51,6 @@ angular.module('umbraco')
 					populate(model.selection[0]);
 				}
 
-				console.log(model);
-				/* entityResource.getUrl(updatedNode.id, entityType).then(function(data){
-						node.url = data;
-					}); */
-
 				$scope.treePickerOverlay.show = false;
 				$scope.treePickerOverlay = null;
 			};
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
index 0e2ace570e..0ac971caad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
@@ -1,18 +1,16 @@
 <div ng-controller="Umbraco.PrevalueEditors.TreePickerController" class="umb-editor umb-contentpicker">
 
-	<div ui-sortable="sortableOptions" ng-model="renderModel">
+	<div ng-model="renderModel">
 		<umb-node-preview
 			ng-repeat="node in renderModel"
 			icon="node.icon"
 			name="node.name"
 			published="node.published"
 			description="node.path"
-			sortable="!sortableOptions.disabled"
-			allow-remove="remove"
-			allow-open="model.config.showOpenButton && allowOpenButton && !dialogEditor"
-			allow-edit=""
+			sortable="sortable"
+			allow-remove="allowRemove"
+			allow-edit="allowEdit"
 			on-remove="remove($index)"
-			on-open="openMiniEditor(node)"
 			on-edit="openContentPicker()">
 		</umb-node-preview>
 	</div>