[stable9.1] In cases where the server dictates the link share expiration the date...

diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index 1770bdd5a7b7fbe147ca11c73b6865c266bedd80..d1b326a56bcab89d90d00c59c93ef25a78f778cd 100644 (file)
--- 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) {