diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-05-28 14:27:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-28 14:27:01 +0200 |
| commit | 64fb083dd9b4ed271130831273dae180e3e40802 (patch) | |
| tree | 2f542b6f50a67dda005bd879e37b3deb16644b3c /apps/files/js | |
| parent | 4ff4d5583a0a9a32d6a6f90d72cbd53b16e0f46c (diff) | |
| parent | 1cf16fa7aa68f0a96c1e7f5401d851f822a907a4 (diff) | |
| download | nextcloud-server-64fb083dd9b4ed271130831273dae180e3e40802.tar.gz nextcloud-server-64fb083dd9b4ed271130831273dae180e3e40802.zip | |
Merge pull request #15767 from nextcloud/bugfix/0b-quota-create
Hide newFile menu if quota is set to 0B
Diffstat (limited to 'apps/files/js')
| -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 6163f34864b..4d3a171a8e7 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2036,7 +2036,7 @@ this.breadcrumb.setDirectoryInfo(this.dirInfo); if (this.dirInfo.permissions) { - this.setDirectoryPermissions(this.dirInfo.permissions); + this._updateDirectoryPermissions(); } result.sort(this._sortComparator); @@ -2187,11 +2187,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 abc85864fae..b46aeb26eee 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -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; |