Merge pull request #12531 from nextcloud/bugfix/noid/hide-download-folders

Allow to hide download option for folders shared by link

Author: rullzer

apps/files/js/fileactions.js

@@ -371,6 +371,7 @@
 			}, false, context);
 
 			$el.addClass('permanent');
+
 		},
 
 		/**

apps/files_sharing/js/public.js

@@ -50,6 +50,8 @@ OCA.Sharing.PublicApp = {
 		this.initialDir = $('#dir').val();
 
 		var token = $('#sharingToken').val();
+		var hideDownload = $('#hideDownload').val();
+
 
 		// file list mode ?
 		if ($el.find('#filestable').length) {
@@ -92,6 +94,9 @@ OCA.Sharing.PublicApp = {
 					]
 				}
 			);
+			if (hideDownload === 'true') {
+				this.fileList._allowSelection = false;
+			}
 			this.files = OCA.Files.Files;
 			this.files.initialize();
 			// TODO: move to PublicFileList.initialize() once
@@ -192,6 +197,27 @@ OCA.Sharing.PublicApp = {
 				return OC.generateUrl('/s/' + token + '/download') + '?' + OC.buildQueryString(params);
 			};
 
+			this.fileList._createRow = function(fileData) {
+				var $tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments);
+				if (hideDownload === 'true') {
+					this.fileActions.currentFile = $tr.find('td');
+					var mime = this.fileActions.getCurrentMimeType();
+					var type = this.fileActions.getCurrentType();
+					var permissions = this.fileActions.getCurrentPermissions();
+					var action = this.fileActions.getDefault(mime, type, permissions);
+
+					// Remove the link. This means that files without a default action fail hard
+					$tr.find('a.name').attr('href', '#');
+
+					this.fileActions.actions.all = {};
+				}
+				return $tr;
+			};
+
+			this.fileList.isSelectedDownloadable = function () {
+				return hideDownload !== 'true';
+			};
+
 			this.fileList.getUploadUrl = function(fileName, dir) {
 				if (_.isUndefined(dir)) {
 					dir = this.getCurrentDirectory();
@@ -270,6 +296,11 @@ OCA.Sharing.PublicApp = {
 				e.preventDefault();
 				OC.redirect(FileList.getDownloadUrl());
 			});
+
+			if (hideDownload === 'true') {
+				this.fileList.$el.find('#headerSelection').remove();
+				this.fileList.$el.find('.summary').find('td:first-child').remove();
+			}
 		}
 
 		$(document).on('click', '#directLink', function () {

core/js/share/sharedialoglinkshareview_popover_menu.handlebars

@@ -37,7 +37,6 @@
 				</span>
 			</li>
 		{{/if}}
-		{{#if showHideDownloadCheckbox}}
 			<li>
 				<span class="menuitem">
 					<span class="icon-loading-small hidden"></span>
@@ -46,7 +45,6 @@
 					<label for="sharingDialogHideDownload-{{cid}}">{{hideDownloadLabel}}</label>
 				</span>
 			</li>
-		{{/if}}
 		{{#if showPasswordCheckBox}}
 			<li>
 				<span class="menuitem">

core/js/sharedialoglinkshareview.js

@@ -868,7 +868,6 @@
 			var isTalkEnabled = oc_appswebroots['spreed'] !== undefined;
 			var sendPasswordByTalk = share.sendPasswordByTalk;
 
-			var showHideDownloadCheckbox = !this.model.isFolder();
 			var hideDownload = share.hideDownload;
 
 			var maxDate = null;
@@ -905,7 +904,6 @@
 				shareNote: share.note,
 				hasNote: share.note !== '',
 				maxDate: maxDate,
-				showHideDownloadCheckbox: showHideDownloadCheckbox,
 				hideDownload: hideDownload,
 				isExpirationEnforced: isExpirationEnforced,
 			}