Merge pull request #35238 from owncloud/fix-public-link-view-issue-re…

…lease-10.2.0 [10.2.0] Backport of The public link edit template was outside public upload check
owncloud · May 15, 2019 · d4c88d5 · d4c88d5
2 parents eb18d9c + 4cbc7f4
commit d4c88d5
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
@@ -27,12 +27,12 @@
 				'<label class="bold" for="sharingDialogAllowPublicRead-{{cid}}">{{publicReadLabel}}</label>' +
 				'<p><em>{{publicReadDescription}}</em></p>' +
 			'</div>' +
+			'{{#if publicUploadPossible}}' +
 			'<div id="allowPublicRead-{{cid}}" class="public-link-modal--item">' +
 				'<input type="radio" value="{{publicReadWriteValue}}" name="publicPermissions" id="sharingDialogAllowPublicReadWrite-{{cid}}" class="checkbox publicPermissions" {{#if publicReadWriteSelected}}checked{{/if}} />' +
 				'<label class="bold" for="sharingDialogAllowPublicReadWrite-{{cid}}">{{publicReadWriteLabel}}</label>' +
 				'<p><em>{{publicReadWriteDescription}}</em></p>' +
 			'</div>' +
-			'{{#if publicUploadPossible}}' +
 			'<div id="allowpublicUploadWrite-{{cid}}" class="public-link-modal--item">' +
 				'<input type="radio" value="{{publicUploadWriteValue}}" name="publicPermissions" id="sharingDialogAllowpublicUploadWrite-{{cid}}" class="checkbox publicPermissions" {{#if publicUploadWriteSelected}}checked{{/if}} />' +
 				'<label class="bold" for="sharingDialogAllowpublicUploadWrite-{{cid}}">{{publicUploadWriteLabel}}</label>' +

diff --git a/core/js/tests/specs/sharedialoglinkshareviewSpec.js b/core/js/tests/specs/sharedialoglinkshareviewSpec.js
@@ -209,7 +209,54 @@ describe('OC.Share.ShareDialogLinkShareView', function() {
 				});
 				view.render();
 				expect(view.$('.publicPermissions').length).toEqual(4);
+				expect(view.$('.publicPermissions').context.innerHTML).toContain('Download / View');
+				expect(view.$('.publicPermissions').context.innerHTML).toContain('Download / View / Edit');
+				expect(view.$('.publicPermissions').context.innerHTML).toContain('Download / View / Upload');
+				expect(view.$('.publicPermissions').context.innerHTML).toContain('Upload only (File Drop)');
 			});
+			it('renders listing radio buttons for file when public upload is allowed globally', function () {
+				fileInfoModel = new OCA.Files.FileInfoModel({
+					id: '123',
+					name: 'file.txt',
+					path: '/subdir',
+					size: 100,
+					mimetype: 'text/plain',
+					permissions: 31,
+					sharePermissions: 31
+				});
+				itemModel = new OC.Share.ShareItemModel({
+					itemType: 'file',
+					itemSource: 123,
+					permissions: 31
+				}, {
+					configModel: configModel,
+					fileInfoModel: fileInfoModel
+				});
+
+				model = new OC.Share.ShareModel({
+					id: 1,
+					name: 'first link',
+					token: 'tehtokenz',
+					shareType: OC.Share.SHARE_TYPE_LINK,
+					itemType: 'file',
+					stime: 1489657516,
+					permissions: OC.PERMISSION_READ
+				});
+
+				view = new OC.Share.ShareDialogLinkShareView({
+					model: model,
+					itemModel: itemModel
+				});
+
+				model.set({
+					permissions: OC.PERMISSION_READ | OC.PERMISSION_CREATE | OC.PERMISSION_DELETE
+				});
+
+				view.render();
+				expect(view.$('.publicPermissions').length).toEqual(1);
+				expect(view.$('.publicPermissions').context.innerHTML).toContain('Download / View');
+			});
+
 			it('renders checkbox disabled when public upload is disallowed by user', function() {
 				publicUploadConfigStub.returns(true);
 				model.set({