From d6771502f21349d5393158eda6d2d16569fd60c3 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 17 Sep 2013 18:11:43 +0200
Subject: check only permission from link-share to decide if public upload is
 enabled or disabled

---
 core/js/share.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 5d34faf8a5d..250f410072c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -177,7 +177,9 @@ OC.Share={
 				if (allowPublicUploadStatus) {
 					return true;
 				}
-				allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
+				if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
+					allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
+				}
 			});
 
 			html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
-- 
cgit v1.2.3


From 642b064c5b98990f6ac0e3ba344db8cd1fe4d1f8 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 17 Sep 2013 18:18:23 +0200
Subject: we can leave the loop if the permission of the link share was checked

---
 core/js/share.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 250f410072c..641252a4d78 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -174,11 +174,9 @@ OC.Share={
 			var allowPublicUploadStatus = false;
 
 			$.each(data.shares, function(key, value) {
-				if (allowPublicUploadStatus) {
-					return true;
-				}
 				if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
 					allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
+					return true;
 				}
 			});
 
-- 
cgit v1.2.3


From cda58ae3dfc938edff0bee048f54a48f3e6451d7 Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Thu, 19 Sep 2013 10:14:07 +0200
Subject: css selectors never have a : before []

---
 core/js/share.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 5d34faf8a5d..5b93dd30740 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -483,7 +483,7 @@ $(document).ready(function() {
 		if (!$('.cruds', this).is(':visible')) {
 			$('a', this).hide();
 			if (!$('input[name="edit"]', this).is(':checked')) {
-				$('input:[type=checkbox]', this).hide();
+				$('input[type="checkbox"]', this).hide();
 				$('label', this).hide();
 			}
 		} else {
-- 
cgit v1.2.3


From 12b4e7920148e1cf586fa96fafe7fee33a12523b Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 20 Sep 2013 13:11:05 +0200
Subject: calculate correct permissions while toggle the password protection

---
 core/js/share.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index 5d34faf8a5d..f0fc4136e61 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -603,7 +603,17 @@ $(document).ready(function() {
 		if (!$('#showPassword').is(':checked') ) {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ);
+			var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
+
+			// Calculate permissions
+			if (allowPublicUpload) {
+				permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
+			} else {
+				permissions = OC.PERMISSION_READ;
+			}
+
+
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions);
 		} else {
 			$('#linkPassText').focus();
 		}
-- 
cgit v1.2.3


From 71e129f295996a65e2e7d73c5e6a964ba9f8bebf Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 20 Sep 2013 15:47:33 +0200
Subject: initialize variable

---
 core/js/share.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/js/share.js')

diff --git a/core/js/share.js b/core/js/share.js
index f0fc4136e61..094b0be929d 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -604,6 +604,7 @@ $(document).ready(function() {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
 			var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
+			var permissions = 0;
 
 			// Calculate permissions
 			if (allowPublicUpload) {
-- 
cgit v1.2.3