Explorar o código

Fix federated link sharing permissions

If a link share has read permissions it may have too share permissions
(depending on whether federated shares are allowed or not). Therefore
the share permission needs to be ignored when checking the permissions
to determine the public upload status.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez %!s(int64=3) %!d(string=hai) anos
pai
achega
31d2d04c01

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
core/js/dist/share_backend.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
core/js/dist/share_backend.js.map


+ 3 - 1
core/js/sharedialoglinkshareview.js

@@ -882,7 +882,9 @@
 			var publicUploadRChecked = '';
 			var publicUploadWChecked = '';
 
-			switch (this.model.linkSharePermissions(share.id)) {
+			// Public upload status is independent of the share permission,
+			// which is used for federated shares.
+			switch (this.model.linkSharePermissions(share.id) & ~OC.PERMISSION_SHARE) {
 				case OC.PERMISSION_READ:
 					publicUploadRChecked = 'checked';
 					break;

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio