Merge branch 'master' of https://github.com/owncloud/core into last_cron_log

1 files changed, 13 insertions, 1 deletions

diff --git a/core/js/share.js b/core/js/share.js
index 129e50b22d5..9ee50ff6963 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -718,9 +718,21 @@ $(document).ready(function() {
 	$(document).on('change', '#dropdown #expirationDate', function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
+
+		$(this).tipsy('hide');
+		$(this).removeClass('error');
+
 		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
 			if (!result || result.status !== 'success') {
-				OC.dialogs.alert(t('core', 'Error setting expiration date'), t('core', 'Error'));
+				var expirationDateField = $('#dropdown #expirationDate');
+				if (!result.data.message) {
+					expirationDateField.attr('original-title', t('core', 'Error setting expiration date'));
+				} else {
+					expirationDateField.attr('original-title', result.data.message);
+				}
+				expirationDateField.tipsy({gravity: 'n', fade: true});
+				expirationDateField.tipsy('show');
+				expirationDateField.addClass('error');
 			}
 		});
 	});