Remove notify recipient option

Signed-off-by: Roeland Jago Douma <[email protected]>
nextcloud · Oct 19, 2016 · 3b02a74 · 3b02a74
1 parent 74aee46
commit 3b02a74
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 42 deletions.
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
@@ -25,12 +25,6 @@
 					'<div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
 					'{{/if}}' +
 					'<span class="has-tooltip username" title="{{shareWith}}">{{shareWithDisplayName}}</span>' +
-					'{{#if mailNotificationEnabled}}  {{#unless isRemoteShare}}' +
-					'<span class="shareOption">' +
-						'<input id="mail-{{cid}}-{{shareWith}}" type="checkbox" name="mailNotification" class="mailNotification checkbox" {{#if wasMailSent}}checked="checked"{{/if}} />' +
-						'<label for="mail-{{cid}}-{{shareWith}}">{{notifyByMailLabel}}</label>' +
-					'</span>' +
-					'{{/unless}} {{/if}}' +
 					'<span class="sharingOptionsGroup">' +
 						'{{#if editPermissionPossible}}' +
 						'<span class="shareOption">' +
@@ -122,7 +116,6 @@
 			'click .unshare': 'onUnshare',
 			'click .icon-more': 'onToggleMenu',
 			'click .permissions': 'onPermissionChange',
-			'click .mailNotification': 'onSendMailNotification'
 		},
 
 		initialize: function(options) {
@@ -175,7 +168,6 @@
 		getShareeList: function() {
 			var universal = {
 				avatarEnabled: this.configModel.areAvatarsEnabled(),
-				mailNotificationEnabled: this.configModel.isMailNotificationEnabled(),
 				notifyByMailLabel: t('core', 'notify by email'),
 				unshareLabel: t('core', 'Unshare'),
 				canShareLabel: t('core', 'can reshare'),
@@ -371,15 +363,6 @@
 
 			this.model.updateShare(shareId, {permissions: permissions});
 		},
-
-		onSendMailNotification: function(event) {
-			var $target = $(event.target);
-			var $li = $(event.target).closest('li[data-share-id]');
-			var shareType = $li.data('share-type');
-			var shareWith = $li.attr('data-share-with');
-
-			this.model.sendNotificationForShare(shareType, shareWith, $target.is(':checked'));
-		}
 	});
 
 	OC.Share.ShareDialogShareeListView = ShareDialogShareeListView;

diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
@@ -429,30 +429,21 @@
 		/**
 		 * Sends an email notification for the given share
 		 *
-		 * @param {int} shareType share type
-		 * @param {string} shareWith recipient
+		 * @param {int} shareId share type
 		 * @param {bool} state whether to set the notification flag or remove it
 		 */
-		sendNotificationForShare: function(shareType, shareWith, state) {
-			var itemType = this.get('itemType');
-			var itemSource = this.get('itemSource');
-
-			return $.post(
-				OC.generateUrl('core/ajax/share.php'),
-				{
-					action: state ? 'informRecipients' : 'informRecipientsDisabled',
-					recipient: shareWith,
-					shareType: shareType,
-					itemSource: itemSource,
-					itemType: itemType
+		sendNotificationForShare: function(shareId, state) {
+			return $.ajax({
+				type: 'POST',
+				url: this._getUrl('shares/' + encodeURIComponent(shareId) + '/notify'),
+				data: {
+					action: state ? 'informRecipients' : 'informRecipientsDisabled'
 				},
-				function(result) {
-					if (result.status !== 'success') {
-						// FIXME: a model should not show dialogs
-						OC.dialogs.alert(t('core', result.data.message), t('core', 'Warning'));
-					}
-				}
-			);
+				dataType: 'json'
+			}).	fail(function(xhr) {
+				// FIXME: a model should not show dialogs
+				OC.dialogs.alert(t('core', result.data.message), t('core', 'Warning'));
+			});
 		},
 
 		/**

diff --git a/settings/templates/admin/sharing.php b/settings/templates/admin/sharing.php
@@ -55,10 +55,6 @@
 			   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
 		<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
 
-		<input type="checkbox" name="shareapi_allow_public_notification" id="allowPublicMailNotification" class="checkbox"
-			   value="1" <?php if ($_['allowPublicMailNotification'] == 'yes') print_unescaped('checked="checked"'); ?> />
-		<label for="allowPublicMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/>
-
 	</p>
 	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
 		<?php p($l->t( 'Expire after ' )); ?>