hide default expire message if user sets expire date

diff --git a/core/js/share.js b/core/js/share.js
index 2d9de62694b75681e2b5bd0860a4376648f9d674..963c11db79aac524a93afc19dbf3dae6e5c1e6e8 100644 (file)
--- 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');
+                               }
                        }
                });
        });