From 79479708171d842b9d786479f1f4016cfdf3e9cd Mon Sep 17 00:00:00 2001
From: Andy Felton <andy.felton@nemisys.uk.com>
Date: Mon, 28 May 2018 15:33:27 +0100
Subject: [PATCH] Conditional Upload button on Media Picker

Made upload button only appear when media can be uploaded to the current folder. Also ensured acceptedMediatypes is always valid even in the root directory
---
 .../overlays/mediaPicker/mediapicker.controller.js    | 11 ++++++-----
 .../common/overlays/mediaPicker/mediapicker.html      |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index ccb033a57c..b20c513756 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -154,14 +154,15 @@ angular.module("umbraco")
                                 });
                         });
 
-                    mediaTypeHelper.getAllowedImagetypes(folder.id)
-                        .then(function(types) {
-                            $scope.acceptedMediatypes = types;
-                        });
                 } else {
                     $scope.path = [];
                 }
 
+                mediaTypeHelper.getAllowedImagetypes(folder.id)
+                    .then(function (types) {
+                        $scope.acceptedMediatypes = types;
+                    });
+
                 $scope.lockedFolder = folder.id === -1 && $scope.model.startNodeIsVirtual;
 
                 $scope.currentFolder = folder;
@@ -385,4 +386,4 @@ angular.module("umbraco")
 
             onInit();
 
-        });
\ No newline at end of file
+        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
index 6ce53e7571..c73c1d965b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
@@ -27,7 +27,8 @@
                 <umb-button type="button"
                             label-key="general_upload"
                             action="upload()"
-                            disabled="lockedFolder">
+                            disabled="lockedFolder"
+                            ng-if="acceptedMediatypes.length > 0">
                 </umb-button>
             </div>