summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-08-30 15:39:43 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2013-08-30 15:39:43 +0200
commit10cf1b3a4e03dfa908d9dfc7cae85e9bd418e5bf (patch)
tree64548871f1d99e734fdb424511a70ff0cd866da2 /core
parent77adaee6457c3e17d0f0b32c74da4cdbfce60164 (diff)
downloadnextcloud-server-10cf1b3a4e03dfa908d9dfc7cae85e9bd418e5bf.tar.gz
nextcloud-server-10cf1b3a4e03dfa908d9dfc7cae85e9bd418e5bf.zip
return mailSend status in getItems()
Diffstat (limited to 'core')
-rw-r--r--core/js/share.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/js/share.js b/core/js/share.js
index c806d83f10c..7d7f580c9bb 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -114,6 +114,7 @@ OC.Share={
data = false;
}
}});
+
return data;
},
share:function(itemType, itemSource, shareType, shareWith, permissions, callback) {
@@ -219,7 +220,7 @@ OC.Share={
if (share.collection) {
OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, share.collection);
} else {
- OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.mail_send, share.permissions, possiblePermissions, share.mail_send, false);
+ OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, false);
}
}
if (share.expiration != null) {
@@ -344,7 +345,7 @@ OC.Share={
mailNotificationEnabled = $('input:hidden[name=mailNotificationEnabled]').val();
if (mailNotificationEnabled === 'yes') {
checked = '';
- if (mailSend === true) {
+ if (mailSend === '1') {
checked = 'checked';
}
html += '<input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify user by email')+'</label>';