Merge pull request #1155 from nextcloud/fix-server-side-share-expirat…

…ion-setting-stable9 In cases where the server dictates the link share expiration the date…
nextcloud · Aug 29, 2016 · 4382364 · 4382364
2 parents 9b29ed0 + 5856616
commit 4382364
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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) {