[Pkg-owncloud-commits] [owncloud] 114/123: Merge pull request #15738 from rullzer/fix_15611

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit d15471abd4751057e534dec086c5164bd848a82f
Merge: 8543b21 efd6fec
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon May 18 11:26:12 2015 +0200

    Merge pull request #15738 from rullzer/fix_15611
    
    Fix to make sure expiration date is properly set

 core/js/share.js                 | 36 ++++++++++++++++++++++++++----------
 core/js/tests/specs/shareSpec.js | 27 +++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 10 deletions(-)

diff --cc core/js/share.js
index aa90790,9f01a5f..121ee97
--- a/core/js/share.js
+++ b/core/js/share.js
@@@ -986,23 -1004,10 +1004,15 @@@ $(document).ready(function() 
  			$('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link'));
  			// Reset link
  			$('#linkText').val('');
 +			$('#showPassword').prop('checked', false);
 +			$('#linkPass').hide();
 +			$('#sharingDialogAllowPublicUpload').prop('checked', false);
 +			$('#expirationCheckbox').prop('checked', false);
 +			$('#expirationDate').hide();
  			var expireDateString = '';
- 			if (oc_appconfig.core.defaultExpireDateEnabled) {
- 				var date = new Date().getTime();
- 				var expireAfterMs = oc_appconfig.core.defaultExpireDate * 24 * 60 * 60 * 1000;
- 				var expireDate = new Date(date + expireAfterMs);
- 				var month = expireDate.getMonth() + 1;
- 				var year = expireDate.getFullYear();
- 				var day = expireDate.getDate();
- 				expireDateString = year + "-" + month + '-' + day + ' 00:00:00';
- 			}
  			// Create a link
  			if (oc_appconfig.core.enforcePasswordForPublicLink === false) {
+ 				expireDateString = OC.Share.getDefaultExpirationDate();
  				$loading.removeClass('hidden');
  				$button.addClass('hidden');
  				$button.prop('disabled', true);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git