diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2016-08-30 01:19:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 01:19:08 +0300 |
| commit | 43823645a4d3789dc2def66d4344b1b031c32118 (patch) | |
| tree | e9d11c857b519906e826b90b60a820ee68619a9d | |
| parent | 9b29ed08c5c30318b42e6d43a1dd062e0f9bf695 (diff) | |
| parent | 5856616d95aa1b50568259baf8425dbd2f4b5f33 (diff) | |
Merge pull request #1155 from nextcloud/fix-server-side-share-expiration-setting-stable9
In cases where the server dictates the link share expiration the date…
| -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 fa5c0c00986..44856b2219b 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: '' }); @@ -104,8 +105,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) { |