U4-10023 - virtual root start node in mediapicker

src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js

@@ -16,8 +16,7 @@ angular.module("umbraco")
             $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
             $scope.cropSize = dialogOptions.cropSize;
             $scope.lastOpenedNode = localStorageService.get("umbLastOpenedMediaNodeId");
-
-            $scope.canFolderInput = true; // FIXME only if ... ?
+            $scope.lockedFolder = true;
 
             var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
             var allowedUploadFiles = mediaHelper.formatFileTypes(umbracoSettings.allowedUploadFiles);
@@ -123,6 +122,8 @@ angular.module("umbraco")
                     $scope.path = [];
                 }
 
+                $scope.lockedFolder = folder.id === -1 && $scope.model.startNodeIsVirtual;
+
                 $scope.currentFolder = folder;
                 localStorageService.set("umbLastOpenedMediaNodeId", folder.id);
                 return getChildren(folder.id);

src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html

@@ -30,7 +30,7 @@
                 type="button"
                 label-key="general_upload"
                 action="upload()"
-                disabled="disabled">
+                disabled="lockedFolder">
              </umb-button>
          </div>
 
@@ -48,7 +48,7 @@
                <span class="umb-breadcrumbs__seperator">&#47;</span>
             </li>
 
-            <li class="umb-breadcrumbs__ancestor" ng-if="canFolderInput">
+            <li class="umb-breadcrumbs__ancestor" ng-if="!lockedFolder">
                <a href ng-hide="showFolderInput" ng-click="showFolderInput = true">
                   <i class="icon icon-add small"></i>
                </a>
@@ -67,7 +67,7 @@
       </div>
 
       <umb-file-dropzone
-         ng-if="acceptedMediatypes.length > 0 && !loading"
+         ng-if="acceptedMediatypes.length > 0 && !loading && !lockedFolder"
          accepted-mediatypes="acceptedMediatypes"
          parent-id="{{currentFolder.id}}"
          files-uploaded="onUploadComplete"

src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js

@@ -9,9 +9,12 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
         var disableFolderSelect = $scope.model.config.disableFolderSelect && $scope.model.config.disableFolderSelect !== '0' ? true : false;
 
         if (!$scope.model.config.startNodeId) {
-            userService.getCurrentUser().then(function (userData) {
+            userService.getCurrentUser().then(function(userData) {
                 $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
             });
+        } else {
+            $scope.model.config.startNodeIsVirtual = false;
         }
 
         function setupViewModel() {
@@ -73,6 +76,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                view: "mediapicker",
                title: "Select media",
                startNodeId: $scope.model.config.startNodeId,
+               startNodeIsVirtual: $scope.model.config.startNodeIsVirtual,
                multiPicker: multiPicker,
                onlyImages: onlyImages,
                disableFolderSelect: disableFolderSelect,