[Pkg-owncloud-commits] [owncloud] 88/172: hide default expire message if user sets expire date

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit b985021082e6605799665d084f5bce992daf09c9
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Tue May 13 11:56:04 2014 +0200

    hide default expire message if user sets expire date
---
 core/js/share.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/js/share.js b/core/js/share.js
index 2d9de62..963c11d 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -746,6 +746,9 @@ $(document).ready(function() {
 					OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error'));
 				}
 				$('#expirationDate').hide('blind');
+				if (oc_appconfig.core.defaultExpireDateEnforced === 'no') {
+					$('#defaultExpireMessage'). show('blind');
+				}
 			});
 		}
 	});
@@ -768,6 +771,10 @@ $(document).ready(function() {
 				expirationDateField.tipsy({gravity: 'n', fade: true});
 				expirationDateField.tipsy('show');
 				expirationDateField.addClass('error');
+			} else {
+				if (oc_appconfig.core.defaultExpireDateEnforced === 'no') {
+					$('#defaultExpireMessage'). hide('blind');
+				}
 			}
 		});
 	});

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