Hide validation pattern for boolean option types

diff --git a/wcfsetup/install/files/acp/templates/customOptionAdd.tpl b/wcfsetup/install/files/acp/templates/customOptionAdd.tpl
index c9db2b2dabedf480bfdae4e010a8f087dc034354..f7938db0fbfc65cb705f13eb7f50eb0570cdd3b2 100644 (file)
--- a/wcfsetup/install/files/acp/templates/customOptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/customOptionAdd.tpl
@@ -10,6 +10,8 @@
                        else {
                                $('#selectOptionsDL').hide();
                        }
+                       
+                       window[($value === 'boolean' ? 'elHide' : 'elShow')](elById('validationPatternDL'));
                });
                $('#optionType').trigger('change');
        });
@@ -108,7 +110,7 @@
                </dd>
        </dl>
        
-       <dl{if $errorField == 'validationPattern'} class="formError"{/if}>
+       <dl id="validationPatternDL"{if $errorField == 'validationPattern'} class="formError"{/if}>
                <dt><label for="validationPattern">{lang}wcf.acp.customOption.validationPattern{/lang}</label></dt>
                <dd>
                        <input type="text" id="validationPattern" name="validationPattern" value="{$validationPattern}" class="long">

diff --git a/wcfsetup/install/files/lib/acp/form/AbstractCustomOptionForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractCustomOptionForm.class.php
index dcf1a0425e77b9ce14bda74467451e5b627d89da..7b635ade7d7b77f4a443580b0479eac3b14c1a93 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/AbstractCustomOptionForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AbstractCustomOptionForm.class.php
@@ -163,6 +163,8 @@ abstract class AbstractCustomOptionForm extends AbstractAcpForm {
                
                if ($this->optionType == 'boolean' || $this->optionType == 'integer') {
                        $this->defaultValue = intval($this->defaultValue);
+                       
+                       if ($this->optionType == 'boolean') $this->validationPattern = '';
                }
                if ($this->optionType == 'float') {
                        $this->defaultValue = floatval($this->defaultValue);