Просмотр исходного кода

Ticket #5366 - Forms Builder: Editing the Password field removes regular expression in its checker.

AntonLV 8 месяцев назад
Родитель
Сommit
902ee95a44

+ 1 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -947,6 +947,7 @@
 	<string name="_adm_form_txt_field_checker_params_length_min"><![CDATA[Min Value]]></string>
 	<string name="_adm_form_txt_field_checker_params_required"><![CDATA[Required]]></string>
 	<string name="_adm_form_txt_field_checker_params_preg"><![CDATA[Expression]]></string>
+        <string name="_adm_form_txt_field_checker_password"><![CDATA[Password (correct password format with regular expression)]]></string>
 	<string name="_adm_form_txt_field_checker_preg"><![CDATA[Regular Expression (something specific must be entered)]]></string>
 	<string name="_adm_form_txt_field_collapsed"><![CDATA[Collapsed]]></string>
 	<string name="_adm_form_txt_field_edit_popup"><![CDATA[Edit "{0}" Field]]></string>

+ 1 - 0
modules/boonex/russian/data/langs/system/ru.xml

@@ -938,6 +938,7 @@
 	<string name="_adm_form_txt_field_checker_params_length_max"><![CDATA[Макс. значение]]></string>
 	<string name="_adm_form_txt_field_checker_params_length_min"><![CDATA[Мин. значение]]></string>
 	<string name="_adm_form_txt_field_checker_params_required"><![CDATA[Значение обязательно]]></string>
+        <string name="_adm_form_txt_field_checker_password"><![CDATA[Пароль (правильный формат пароля с использованием регулярного выражения)]]></string>
 	<string name="_adm_form_txt_field_checker_params_preg"><![CDATA[Выражение]]></string>
 	<string name="_adm_form_txt_field_checker_preg"><![CDATA[Регулярное выражение (нужно ввести что-то специфичное)]]></string>
 	<string name="_adm_form_txt_field_collapsed"><![CDATA[Свёрнуто]]></string>

+ 1 - 0
studio/js/forms_fields.js

@@ -124,6 +124,7 @@ BxDolStudioFormsFields.prototype.onSelectChecker = function(oSelect, bClear) {
             break;
 
         case 'preg':
+        case 'password':
             $('#bx-form-element-checker_params_preg').show().find('input').removeAttr('disabled');
             break;
     }

+ 11 - 8
studio/template/scripts/BxBaseStudioFormsField.php

@@ -332,6 +332,7 @@ class BxBaseStudioFormsField extends BxDolStudioFormsField
                                 unset($aForm['inputs']['checker_params_length_min']['attrs']['disabled'], $aForm['inputs']['checker_params_length_max']['attrs']['disabled'], $aForm['inputs']['checker_params_required']['attrs']['disabled']);
                                 break;
                             case 'preg':
+                            case 'password':
                                 if(!$bHidden)
                                     unset($aForm['inputs']['checker_params_preg']['tr_attrs']['style']);
                                 unset($aForm['inputs']['checker_params_preg']['attrs']['disabled']);
@@ -760,6 +761,7 @@ class BxBaseStudioFormsField extends BxDolStudioFormsField
                         break;
 
                     case 'preg':
+                    case 'password':
                         unset($oForm->aInputs['checker_params_preg']['tr_attrs']['style']);
                         unset($oForm->aInputs['checker_params_preg']['attrs']['disabled']);
                         $this->unsetCheckerFields($oForm, 'date_range');
@@ -836,6 +838,7 @@ class BxBaseStudioFormsField extends BxDolStudioFormsField
                 break;
 
             case 'preg':
+            case 'password':
                 unset($oForm->aInputs['checker_params_preg']);
                 break;
 
@@ -1311,14 +1314,14 @@ class BxBaseStudioFormsFieldText extends BxBaseStudioFormsFieldBlockHeader
 class BxBaseStudioFormsFieldPassword extends BxBaseStudioFormsFieldText
 {
     protected $sType = 'password';
-    protected $aCheckFunctions = array('avail', 'length', 'preg');
-    
+    protected $aCheckFunctions = array('avail', 'length', 'preg', 'password');
+
     public function init()
-	{
-		parent::init();
+    {
+        parent::init();
 
-		unset($this->aForm['inputs']['unique']);
-	}
+        unset($this->aForm['inputs']['unique']);
+    }
 }
 
 class BxBaseStudioFormsFieldTextarea extends BxBaseStudioFormsFieldText
@@ -1327,8 +1330,8 @@ class BxBaseStudioFormsFieldTextarea extends BxBaseStudioFormsFieldText
     protected $aCheckFunctions = array('avail', 'length', 'preg');
 
     public function init()
-	{
-		parent::init();
+    {
+        parent::init();
 
         $this->aParams['table_field_type'] = 'text';