diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-19 12:16:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-19 12:16:56 +0200 |
| commit | 365797d4b41b6a53431a4667ef547ef913a47221 (patch) | |
| tree | 691f73bf7c5cb012d52f90f287219e58d3fda587 /core/js | |
| parent | 039bd0ebcacab703c4030b1137a0dbb7a9ff7199 (diff) | |
| parent | 497ae34e885067226401f5c5f3fa0b3e6736d1eb (diff) | |
| download | nextcloud-server-365797d4b41b6a53431a4667ef547ef913a47221.tar.gz nextcloud-server-365797d4b41b6a53431a4667ef547ef913a47221.zip | |
Merge pull request #964 from nextcloud/master-aedae12db5ebfaf56bec91b736fb8a569cecf16f
[master] In cases where the server dictates the link share expiration…
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/sharedialogexpirationview.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js index 1770bdd5a7b..d1b326a56bc 100644 --- a/core/js/sharedialogexpirationview.js +++ b/core/js/sharedialogexpirationview.js @@ -93,6 +93,7 @@ this.$el.find('.expirationDateContainer').toggleClass('hidden', !state); if (!state) { // discard expiration date + this.model.get('linkShare').expiration = ''; this.model.saveLinkShare({ expireDate: '' }); @@ -106,8 +107,10 @@ $target.tooltip('hide'); $target.removeClass('error'); + expiration = moment($target.val(), 'DD-MM-YYYY').format('YYYY-MM-DD'); + this.model.get('linkShare').expiration = expiration; this.model.saveLinkShare({ - expiration: moment($target.val(), 'DD-MM-YYYY').format('YYYY-MM-DD') + expiration: expiration }, { error: function(model, message) { if (!message) { |