Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-08-11 11:11:24 +0300
committerLukas Reschke <lukas@statuscode.ch>2016-08-29 16:10:57 +0300
commit5856616d95aa1b50568259baf8425dbd2f4b5f33 (patch)
tree2666e99b7656103109586be3e136cce5f7e3dbe0
parentd2d15082764badd43ed2aa8d44253ff94b7d1b18 (diff)
In cases where the server dictates the link share expiration the date is not updated on consequitive changes and enable/disable actions
-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) {