From b985021082e6605799665d084f5bce992daf09c9 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle <schiessle@owncloud.com> Date: Tue, 13 May 2014 11:56:04 +0200 Subject: [PATCH] hide default expire message if user sets expire date --- core/js/share.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/js/share.js b/core/js/share.js index 2d9de62694..963c11db79 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -746,6 +746,9 @@ $(document).ready(function() { OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error')); } $('#expirationDate').hide('blind'); + if (oc_appconfig.core.defaultExpireDateEnforced === 'no') { + $('#defaultExpireMessage'). show('blind'); + } }); } }); @@ -768,6 +771,10 @@ $(document).ready(function() { expirationDateField.tipsy({gravity: 'n', fade: true}); expirationDateField.tipsy('show'); expirationDateField.addClass('error'); + } else { + if (oc_appconfig.core.defaultExpireDateEnforced === 'no') { + $('#defaultExpireMessage'). hide('blind'); + } } }); }); -- GitLab