Browse Source

Fix #2730

Swap OC.dialogs.alert()'s parameters, so Error is shown
as its title.
remotes/origin/stable6
kondou 13 years ago
parent
commit
5f89812a9b
  1. 8
      core/js/share.js

8
core/js/share.js

@ -133,14 +133,14 @@ OC.Share={
callback(); callback();
} }
} else { } else {
OC.dialogs.alert(t('core', 'Error'), t('core', 'Error while unsharing'));
OC.dialogs.alert(t('core', 'Error while unsharing'), t('core', 'Error'));
} }
}); });
}, },
setPermissions:function(itemType, itemSource, shareType, shareWith, permissions) { setPermissions:function(itemType, itemSource, shareType, shareWith, permissions) {
$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setPermissions', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) { $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setPermissions', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
if (!result || result.status !== 'success') { if (!result || result.status !== 'success') {
OC.dialogs.alert(t('core', 'Error'), t('core', 'Error while changing permissions'));
OC.dialogs.alert(t('core', 'Error while changing permissions'), t('core', 'Error'));
} }
}); });
}, },
@ -574,7 +574,7 @@ $(document).ready(function() {
var itemSource = $('#dropdown').data('item-source'); var itemSource = $('#dropdown').data('item-source');
$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: '' }, function(result) { $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: '' }, function(result) {
if (!result || result.status !== 'success') { if (!result || result.status !== 'success') {
OC.dialogs.alert(t('core', 'Error'), t('core', 'Error unsetting expiration date'));
OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error'));
} }
$('#expirationDate').hide(); $('#expirationDate').hide();
}); });
@ -586,7 +586,7 @@ $(document).ready(function() {
var itemSource = $('#dropdown').data('item-source'); var itemSource = $('#dropdown').data('item-source');
$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) { $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
if (!result || result.status !== 'success') { if (!result || result.status !== 'success') {
OC.dialogs.alert(t('core', 'Error'), t('core', 'Error setting expiration date'));
OC.dialogs.alert(t('core', 'Error setting expiration date'), t('core', 'Error'));
} }
}); });
}); });

Loading…
Cancel
Save