mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15856 from nextcloud/backport/15767/stable16 

[stable16] Hide newFile menu if quota is set to 0B
This commit is contained in:
Roeland Jago Douma 2019-06-05 09:03:16 +02:00 committed by GitHub
parent 24c8fc22df f8d32096b2
commit 45505407de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/files/js/filelist.js
View File

@ -2038,7 +2038,7 @@
this.breadcrumb.setDirectoryInfo(this.dirInfo);
if (this.dirInfo.permissions) {
this.setDirectoryPermissions(this.dirInfo.permissions);
this._updateDirectoryPermissions();
}
result.sort(this._sortComparator);
@ -2189,11 +2189,8 @@
img.src = previewURL;
},
/**
* @deprecated
*/
setDirectoryPermissions: function(permissions) {
var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
_updateDirectoryPermissions: function() {
var isCreatable = (this.dirInfo.permissions & OC.PERMISSION_CREATE) !== 0 && this.$el.find('#free_space').val() !== '0';
this.$el.find('#permissions').val(permissions);
this.$el.find('.creatable').toggleClass('hidden', !isCreatable);
this.$el.find('.notCreatable').toggleClass('hidden', isCreatable);

1
apps/files/js/files.js
View File

@ -75,6 +75,7 @@
$('#owner').val(response.data.owner);
$('#ownerDisplayName').val(response.data.ownerDisplayName);
Files.displayStorageWarnings();
OCA.Files.App.fileList._updateDirectoryPermissions();
}
if (response[0] === undefined) {
return;