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-19 00:35:07 +0200
commit554e96cb1c69ba40df9f26d7dc7c413535a53199 (patch)
tree67f69f782b1c8167da127aa89b1fe3464083a22e /core
parent8b9536c22bc4f1a9d6b810177e9e965e51e89087 (diff)
downloadnextcloud-server-554e96cb1c69ba40df9f26d7dc7c413535a53199.tar.gz
nextcloud-server-554e96cb1c69ba40df9f26d7dc7c413535a53199.zip
[stable9.1] 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) {