summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-08-11 10:11:24 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2016-08-12 16:10:49 +0200
commitaedae12db5ebfaf56bec91b736fb8a569cecf16f (patch)
tree554fd6312c7994d46717394aa702d9b3450cc218 /core
parentf2f86e850577c8373c7b4de51461e6ad9e0b9319 (diff)
downloadnextcloud-server-aedae12db5ebfaf56bec91b736fb8a569cecf16f.tar.gz
nextcloud-server-aedae12db5ebfaf56bec91b736fb8a569cecf16f.zip
In cases where the server dictates the link share expiration the date is not updated on consequitive changes and enable/disable actions
Diffstat (limited to 'core')
-rw-r--r--core/js/sharedialogexpirationview.js5
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) {