From 0320485229ab70c7c22e4f172ffef4dc5186b85d Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Wed, 21 Oct 2015 11:52:15 +0200
Subject: [PATCH] Adds the media listview to media dashboard

---
 .../dashboard/dashboard.tabs.controller.js    | 39 ++++++++++---------
 .../dashboard/media/mediafolderbrowser.html   | 18 +--------
 2 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
index 9b81d3ce0a..b400185b02 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
@@ -43,7 +43,7 @@ function FormsController($scope, $route, $cookieStore, packageResource) {
 
     $scope.complete = function(result){
         var url = window.location.href + "?init=true";
-        $cookieStore.put("umbPackageInstallId", result.packageGuid); 
+        $cookieStore.put("umbPackageInstallId", result.packageGuid);
         window.location.reload(true);
     };
 
@@ -186,26 +186,29 @@ function startupLatestEditsController($scope) {
 }
 angular.module("umbraco").controller("Umbraco.Dashboard.StartupLatestEditsController", startupLatestEditsController);
 
-function MediaFolderBrowserDashboardController($rootScope, $scope, assetsService, $routeParams, $timeout, $element, $location, umbRequestHelper,navigationService, mediaResource, $cookies, mediaHelper) {
-        var dialogOptions = $scope.dialogOptions;
+function MediaFolderBrowserDashboardController($rootScope, $scope, contentTypeResource) {
 
-        $scope.filesUploading = [];
-        $scope.nodeId = -1;
-        $scope.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
+    //get the system media listview
+    contentTypeResource.getPropertyTypeScaffold(-96)
+        .then(function(dt) {
 
-        function loadChildren() {
-                mediaResource.getChildren($scope.nodeId)
-                    .then(function(data) {
-                        $scope.images = data.items;
-                });
-        }
+            $scope.fakeProperty = {
+                alias: "contents",
+                config: dt.config,
+                description: "",
+                editor: dt.editor,
+                hideLabel: true,
+                id: 1,
+                label: "Contents:",
+                validation: {
+                    mandatory: false,
+                    pattern: null
+                },
+                value: "",
+                view: dt.view
+            };
 
-        $scope.onUploadComplete = function () {
-            navigationService.reloadSection("media");
-            loadChildren();
-        }
-
-        loadChildren();
+    });
 
 }
 angular.module("umbraco").controller("Umbraco.Dashboard.MediaFolderBrowserDashboardController", MediaFolderBrowserDashboardController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html
index f1189f3499..d49bdd89a5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html
@@ -1,19 +1,3 @@
 <div ng-controller="Umbraco.Dashboard.MediaFolderBrowserDashboardController">
-
-	<umb-file-dropzone
-		ng-if="creating == null"
-		parent-id="{{nodeId}}"
-		compact="[images.length > 0}"
-		files-uploaded="onUploadComplete"
-		accept="{{ acceptedFileTypes }}">
-	</umb-file-dropzone>
-
-
-	<umb-photo-folder ng-show="images.length > 0"
-                      min-height="105"
-                      min-width="220"
-                      on-click="clickHandler"
-                      ng-model="images" />
-
-
+	<umb-editor ng-if="fakeProperty" model="fakeProperty"></umb-editor>
 </div>