Merge pull request #3677 from owncloud/feature/no-dragndrop-if-upload…

…-not-allowed
owncloud · Jul 7, 2020 · affc306 · affc306
2 parents 136a3a2 + 3e202e2
commit affc306
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/apps/files/src/components/FilesAppBar.vue b/apps/files/src/components/FilesAppBar.vue
@@ -1,7 +1,7 @@
 <template>
  <div id="files-app-bar" class="oc-app-bar">
  <file-drop
- v-if="!isIE11()"
+ v-if="!isIE11() && canUpload && hasFreeSpace"
  :root-path="item"
  :path="currentPath"
  :headers="headers"
@@ -279,8 +279,10 @@ export default {
 
  hasFreeSpace() {
  return (
- (this.quota && this.quota.free > 0) ||
- (this.currentFolder && this.currentFolder.permissions.indexOf('M') >= 0) ||
+ (this.quota && this.quota.free) > 0 ||
+ (this.currentFolder &&
+ this.currentFolder.permissions &&
+ this.currentFolder.permissions.indexOf('M') >= 0) ||
  this.publicPage()
  )
  },

diff --git a/changelog/unreleased/no-dragndrop-if-upload-not-allowed b/changelog/unreleased/no-dragndrop-if-upload-not-allowed
@@ -0,0 +1,4 @@
+Change: No file drop if upload is not allowed or no space is left
+
+
+https://github.com/owncloud/phoenix/pull/3677