diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-30 16:29:22 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-30 16:29:22 +0200 |
| commit | 65ddefc89d6730f3c32727bddae2895232c66a62 (patch) | |
| tree | 0b191e4f77798aca1db34b36f86e1e305390db93 /core | |
| parent | 36574241f821f0cbef2f52032b8187b99c5fce94 (diff) | |
| download | nextcloud-server-65ddefc89d6730f3c32727bddae2895232c66a62.tar.gz nextcloud-server-65ddefc89d6730f3c32727bddae2895232c66a62.zip | |
set sendMail status back to false
Diffstat (limited to 'core')
| -rw-r--r-- | core/ajax/share.php | 8 | ||||
| -rw-r--r-- | core/js/share.js | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php index 9727f7d02e3..76a67f54720 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -134,7 +134,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo \OCP\User::getDisplayName() ); } catch (Exception $exception) { - $noMail[] = \OCP\User::getDisplayName($recipient['displayName']); + $noMail[] = \OCP\User::getDisplayName($recipient); } } else { $noMail[] = \OCP\User::getDisplayName($recipient); @@ -151,12 +151,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo break; case 'informRecipientsDisabled': $itemSource = $_POST['itemSource']; + $shareType = $_POST['shareType']; $itemType = $_POST['itemType']; $recipient = $_POST['recipient']; - //$share = $shareManager->getShares($itemType, array('shareWith' => $recipient, 'isShareWithUser' => true, 'itemSource' => $itemSource)); - //$share[0]->setMailSend(false); - //$shareManager->update($share[0]); - //write status to db + \OCP\Share::setSendMailStatus($itemType, $itemSource, $shareType, false); OCP\JSON::success(); break; diff --git a/core/js/share.js b/core/js/share.js index 7d7f580c9bb..e253f77ef27 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -695,9 +695,7 @@ $(document).ready(function() { } }); - $(document).on('click', '#dropdown input[name=mailNotification]', function(event) { - event.preventDefault(); - event.stopPropagation(); + $(document).on('click', '#dropdown input[name=mailNotification]', function() { var li = $(this).parent(); var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); |