diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2016-04-22 14:50:42 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2016-04-22 14:50:42 +0200 |
| commit | 606b756a94643eaae87e18b39f6c75e6d18fec7e (patch) | |
| tree | 6128dd0ed676164bbfb8a4aa10a56cc511728edd /core/js/shareitemmodel.js | |
| parent | cc4efc4c03f4d4f7ec9e6cf9beac570254bef3c1 (diff) | |
| parent | 2a6a336e873db394e9912de20478645f3e4b8fc4 (diff) | |
| download | nextcloud-server-606b756a94643eaae87e18b39f6c75e6d18fec7e.tar.gz nextcloud-server-606b756a94643eaae87e18b39f6c75e6d18fec7e.zip | |
Merge pull request #23918 from owncloud/cruds-for-federated-shares
bring back CRUDS permissions for federated shares
Diffstat (limited to 'core/js/shareitemmodel.js')
| -rw-r--r-- | core/js/shareitemmodel.js | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js index 292230d26d5..3ced66a1a78 100644 --- a/core/js/shareitemmodel.js +++ b/core/js/shareitemmodel.js @@ -154,21 +154,17 @@ // Default permissions are Edit (CRUD) and Share // Check if these permissions are possible var permissions = OC.PERMISSION_READ; - if (shareType === OC.Share.SHARE_TYPE_REMOTE) { - permissions = OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_READ; - } else { - if (this.updatePermissionPossible()) { - permissions = permissions | OC.PERMISSION_UPDATE; - } - if (this.createPermissionPossible()) { - permissions = permissions | OC.PERMISSION_CREATE; - } - if (this.deletePermissionPossible()) { - permissions = permissions | OC.PERMISSION_DELETE; - } - if (this.configModel.get('isResharingAllowed') && (this.sharePermissionPossible())) { - permissions = permissions | OC.PERMISSION_SHARE; - } + if (this.updatePermissionPossible()) { + permissions = permissions | OC.PERMISSION_UPDATE; + } + if (this.createPermissionPossible()) { + permissions = permissions | OC.PERMISSION_CREATE; + } + if (this.deletePermissionPossible()) { + permissions = permissions | OC.PERMISSION_DELETE; + } + if (this.configModel.get('isResharingAllowed') && (this.sharePermissionPossible())) { + permissions = permissions | OC.PERMISSION_SHARE; } attributes.permissions = permissions; @@ -411,12 +407,6 @@ if(!_.isObject(share)) { throw "Unknown Share"; } - if( share.share_type === OC.Share.SHARE_TYPE_REMOTE - && ( permission === OC.PERMISSION_SHARE - || permission === OC.PERMISSION_DELETE)) - { - return false; - } return (share.permissions & permission) === permission; }, |