diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-16 16:43:38 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-16 16:43:38 +0300 |
| commit | c2ded337e602c6113c4adeb9071ef6581dfa5a81 (patch) | |
| tree | 373d60dcdce55b36f3abeaa995245b42c55b5035 | |
| parent | 923e6ca1bf1c26481ced77ded4cf04ad969c13ac (diff) | |
| parent | f3392f9e59612119453ab48b2f4d65daca618e05 (diff) | |
Merge pull request #19830 from owncloud/fix-expiration-format-stable8.1
Use proper format when setting the expiration date
| -rw-r--r-- | core/js/share.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/js/share.js b/core/js/share.js index 79fcf61c215..baf5fe5b335 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -1063,7 +1063,8 @@ $(document).ready(function() { $button.prop('disabled', false); OC.Share.showLink(data.token, null, itemSource); if (data.expiration) { - OC.Share.showExpirationDate(data.expiration); + var expireDate = moment(data.expiration, 'YYYY-MM-DD').format('DD-MM-YYYY'); + OC.Share.showExpirationDate(expireDate); } $('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares})); OC.Share.updateIcon(itemType, itemSource); @@ -1207,7 +1208,8 @@ $(document).ready(function() { } if (data.expiration) { - OC.Share.showExpirationDate(data.expiration); + var expireDate = moment(data.expiration, 'YYYY-MM-DD').format('DD-MM-YYYY'); + OC.Share.showExpirationDate(expireDate); } $('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares})); }, function(result) { |