diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-07-03 18:15:02 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-07-03 18:15:02 +0200 |
| commit | 91cb0a6ead64d6b993f04c56a81a0ae7f6d0d84c (patch) | |
| tree | 48318c7c33f647fc523e6187af231bdd03bb8538 /core | |
| parent | c6bba23636a55be9f177a0bdbe737829963d0044 (diff) | |
| parent | 79e54994f9c7cb43f1a89cd9d95f053eff7df1f7 (diff) | |
| download | nextcloud-server-91cb0a6ead64d6b993f04c56a81a0ae7f6d0d84c.tar.gz nextcloud-server-91cb0a6ead64d6b993f04c56a81a0ae7f6d0d84c.zip | |
Merge pull request #9402 from owncloud/sharing_improved_dialog
only show message if default expire date is enforced
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/share.js | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/js/share.js b/core/js/share.js index 62271a43ceb..9af86c7e196 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -342,12 +342,8 @@ OC.Share={ html += '<br />'; var defaultExpireMessage = ''; - if ((itemType === 'folder' || itemType === 'file') && oc_appconfig.core.defaultExpireDateEnabled) { - if (oc_appconfig.core.defaultExpireDateEnforced) { - defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created', {'days': escapeHTML(oc_appconfig.core.defaultExpireDate)}) + '<br/>'; - } else { - defaultExpireMessage = t('core', 'By default the public link will expire after {days} days', {'days': escapeHTML(oc_appconfig.core.defaultExpireDate)}) + '<br/>'; - } + if ((itemType === 'folder' || itemType === 'file') && oc_appconfig.core.defaultExpireDateEnforced) { + defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created', {'days': escapeHTML(oc_appconfig.core.defaultExpireDate)}) + '<br/>'; } html += '<input id="linkText" type="text" readonly="readonly" />'; |