diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-06-05 09:03:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-05 09:03:05 +0200 |
| commit | 6cb16d3d40b0f81f7566ad75d2696428d7951d0c (patch) | |
| tree | abfaf83dd4ee591316b60de975dcc35b6206e6cd /apps | |
| parent | 5003dc87f4292496eed5cf62858494a2db360c1e (diff) | |
| parent | 919b172ba0403025ca73a93e7bde70528d09f049 (diff) | |
| download | nextcloud-server-6cb16d3d40b0f81f7566ad75d2696428d7951d0c.tar.gz nextcloud-server-6cb16d3d40b0f81f7566ad75d2696428d7951d0c.zip | |
Merge pull request #15855 from nextcloud/backport/15767/stable15
[stable15] Hide newFile menu if quota is set to 0B
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/filelist.js | 9 | ||||
| -rw-r--r-- | apps/files/js/files.js | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 9ce208abc3a..83ac39e18ac 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1925,7 +1925,7 @@ this.breadcrumb.setDirectoryInfo(this.dirInfo); if (this.dirInfo.permissions) { - this.setDirectoryPermissions(this.dirInfo.permissions); + this._updateDirectoryPermissions(); } result.sort(this._sortComparator); @@ -2077,11 +2077,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); diff --git a/apps/files/js/files.js b/apps/files/js/files.js index d739131e9c6..8ead2b576e8 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -72,6 +72,7 @@ $('#owner').val(response.data.owner); $('#ownerDisplayName').val(response.data.ownerDisplayName); Files.displayStorageWarnings(); + OCA.Files.App.fileList._updateDirectoryPermissions(); } if (response[0] === undefined) { return; |