summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2013-09-26 03:16:15 -0700
committerBjörn Schießle <bjoern@schiessle.org>2013-09-26 03:16:15 -0700
commit6b1d70f148de8ce9d1fa7944a114823bf6decd35 (patch)
treef8f36e0e66b69557c41cca55549dea2d9156ae34 /core
parent2334f9690640ac01ea7403506f13cce8533cea37 (diff)
parent642b064c5b98990f6ac0e3ba344db8cd1fe4d1f8 (diff)
downloadnextcloud-server-6b1d70f148de8ce9d1fa7944a114823bf6decd35.tar.gz
nextcloud-server-6b1d70f148de8ce9d1fa7944a114823bf6decd35.zip
Merge pull request #4887 from owncloud/sharing_disable_public_upload
check only permission from link-share to decide if public upload is enabled or disabled
Diffstat (limited to 'core')
-rw-r--r--core/js/share.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/share.js b/core/js/share.js
index f54f13c95e3..82f5da0baea 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -174,10 +174,10 @@ OC.Share={
var allowPublicUploadStatus = false;
$.each(data.shares, function(key, value) {
- if (allowPublicUploadStatus) {
+ if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
+ allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
return true;
}
- allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
});
html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';