Changeset 15906 for trunk

Timestamp:

01/23/12 05:07:47 (4 months ago)

Author:

Anton Lesnikov

Message:

Studio -> Form Builder.

Location:

trunk

Files:

• install/sql/v70.sql (modified) (1 diff)
• modules/boonex/english/install/data/langs/en.xml (modified) (1 diff)
• studio/classes/BxDolStudioFormsField.php (modified) (1 diff)
• studio/classes/BxDolStudioFormsFields.php (modified) (2 diffs)
• studio/classes/BxDolStudioFormsQuery.php (modified) (6 diffs)
• studio/js/forms_fields.js (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioFormsDisplays.php (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioFormsField.php (modified) (40 diffs)
• studio/templates/base/scripts/BxBaseStudioFormsFields.php (modified) (8 diffs)
• studio/templates/tmpl_uni/scripts/BxTemplStudioFormsField.php (modified) (1 diff)

trunk/install/sql/v70.sql

@@ -4623 +4623 @@
 ('sys_studio_forms', 'Sql', 'SELECT * FROM `sys_objects_form` WHERE 1 ', 'sys_objects_form', 'id', '', 'active', '', 100, NULL, 'start', '', 'title,module', 'auto', '', 'BxTemplStudioFormsForms', ''),
 ('sys_studio_forms_displays', 'Sql', 'SELECT `td`.`id` AS `id`, `td`.`object` AS `object`, `td`.`display_name` AS `display_name`, `td`.`title` AS `title`, `td`.`module` AS `module`, `tf`.`title` AS `form_title` FROM `sys_form_displays` AS `td` LEFT JOIN `sys_objects_form` AS `tf` ON `td`.`object`=`tf`.`object` WHERE 1 ', 'sys_form_displays', 'id', '', '', '', 100, NULL, 'start', '', 'td`.`title,td`.`module', 'auto', '', 'BxTemplStudioFormsDisplays', ''),
-('sys_studio_forms_fields', 'Sql', 'SELECT `tdi`.`id` AS `id`, `ti`.`caption` AS `title`, `ti`.`type` AS `type`, `ti`.`module` AS `module`, `tdi`.`active` AS `active`, `ti`.`editable` AS `editable`, `ti`.`deletable` AS `deletable`, `tdi`.`order` AS `order` FROM `sys_form_display_inputs` AS `tdi` LEFT JOIN `sys_form_inputs` AS `ti` ON `tdi`.`input_name`=`ti`.`name` AND `ti`.`object`=? WHERE 1 AND `tdi`.`display_name`=?', 'sys_form_display_inputs', 'id', 'order', 'active', '', 100, NULL, 'start', '', 'ti`.`type,ti`.`caption', 'auto', '', 'BxTemplStudioFormsFields', ''),
+('sys_studio_forms_fields', 'Sql', 'SELECT `tdi`.`id` AS `id`, `ti`.`caption` AS `title`, `ti`.`type` AS `type`, `ti`.`module` AS `module`, `tdi`.`visible_for_levels` AS `visible_for_levels`, `tdi`.`active` AS `active`, `ti`.`editable` AS `editable`, `ti`.`deletable` AS `deletable`, `tdi`.`order` AS `order` FROM `sys_form_display_inputs` AS `tdi` LEFT JOIN `sys_form_inputs` AS `ti` ON `tdi`.`input_name`=`ti`.`name` AND `ti`.`object`=? WHERE 1 AND `tdi`.`display_name`=?', 'sys_form_display_inputs', 'id', 'order', 'active', '', 100, NULL, 'start', '', 'ti`.`type,ti`.`caption', 'auto', '', 'BxTemplStudioFormsFields', ''),
 ('sys_studio_forms_pre_lists', 'Sql', 'SELECT * FROM `sys_form_pre_lists` WHERE 1 ', 'sys_form_pre_lists', 'id', '', '', '', 100, NULL, 'start', '', 'module,key,title', 'auto', '', 'BxTemplStudioFormsPreLists', ''),
 ('sys_studio_forms_pre_values', 'Sql', 'SELECT * FROM `sys_form_pre_values` WHERE 1 ', 'sys_form_pre_values', 'id', 'Order', '', '', 100, NULL, 'start', '', 'Key,Value,LKey,LKey2', 'auto', '', 'BxTemplStudioFormsPreValues', '');

trunk/modules/boonex/english/install/data/langs/en.xml

@@ -2327 +2327 @@
     <string name="_adm_form_txt_field_value"><![CDATA[Value]]></string>
     <string name="_adm_form_dsc_field_value"><![CDATA[Enter default value (optional)]]></string>
+    <string name="_adm_form_txt_field_value_button"><![CDATA[Title]]></string>
+    <string name="_adm_form_dsc_field_value_button"><![CDATA[Enter button title here]]></string>
+    <string name="_adm_form_txt_field_value_checkbox"><![CDATA[Value]]></string>
+    <string name="_adm_form_dsc_field_value_checkbox"><![CDATA[If enabled the value to be passed on form submit]]></string>
     <string name="_adm_form_txt_field_values"><![CDATA[Values]]></string>
     <string name="_adm_form_txt_field_manage_values"><![CDATA[Manage values]]></string>

trunk/studio/classes/BxDolStudioFormsField.php

@@ -15 +15 @@
 class BxDolStudioFormsField extends BxDol {
     protected $oDb;
+    protected $aParams = array();
     protected $aField = array();
+    protected $aCheckFunctions = array();
 
-    public function __construct($aField = array()) {
+    public function __construct($aParams = array(), $aField = array()) {
         parent::__construct();
 
         $this->oDb = new BxDolStudioFormsQuery(); 
 
+        $this->aParams = $aParams;
         $this->aField = $aField;
+
+        if(isset($this->aParams['object']) && isset($this->aParams['display'])) {
+            $aForm = array();
+            $this->oDb->getForms(array('type' => 'by_object_display', 'object' => $this->aParams['object'], 'display' => $this->aParams['display']), $aForm, false);
+
+            $this->aParams['table'] = $aForm['table'];
+        }
+    }
+
+    function alterAdd($sName) {
+        if(!isset($this->aParams['table']) || !isset($this->aParams['table_field_type']))
+            return '';
+
+        return $this->oDb->alterAdd($this->aParams['table'], $sName, $this->aParams['table_field_type']);
+    }
+
+    function alterRemove($sName) {
+        if(!isset($this->aParams['table']))
+            return '';
+
+        return $this->oDb->alterRemove($this->aParams['table'], $sName);
     }
 

trunk/studio/classes/BxDolStudioFormsFields.php

@@ -16 +16 @@
 
 class BxDolStudioFormsFields extends BxTemplStudioGrid {
+    protected $sObject = '';
     protected $sDisplay = '';
 
@@ -23 +24 @@
         $this->oDb = new BxDolStudioFormsQuery();
 
+        $sObject = bx_process_input(bx_get('object'));
+        if($sObject != '')
+            $this->sObject = $sObject;
+
         $sDisplay = bx_process_input(bx_get('display'));
         if($sDisplay != '')
             $this->sDisplay = $sDisplay;
 
+        $this->_aQueryAppend['object'] = $this->sObject;
         $this->_aQueryAppend['display'] = $this->sDisplay;
     }
 
     protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage) {
-        if(empty($this->sDisplay))
+        if(empty($this->sObject) || empty($this->sDisplay))
             return array();
 
-        $this->oDb->checkFieldsInDisplays($this->sDisplay);
+        $this->oDb->checkFieldsInDisplays($this->sObject, $this->sDisplay);
 
-        $aDisplay = array();
-        $this->oDb->getDisplays(array('type' => 'by_name', 'value' => $this->sDisplay), $aDisplay, false);
-        if(empty($aDisplay) || !is_array($aDisplay))
-            return array();
-
-        $this->_aOptions['source'] = $this->oDb->prepare($this->_aOptions['source'], $aDisplay['object'], $aDisplay['name']);
+        $this->_aOptions['source'] = $this->oDb->prepare($this->_aOptions['source'], $this->sObject, $this->sDisplay);
         return parent::_getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage);
     }

trunk/studio/classes/BxDolStudioFormsQuery.php

@@ -28 +28 @@
                 $sWhereClause = $this->prepare(" AND `tf`.`id`=? ", $aParams['value']);
                 break;
-            case 'by_object':
-                $sWhereClause = $this->prepare(" AND `tf`.`object`=? ", $aParams['value']);
+            case 'by_object_display':
+                $aMethod['name'] = 'getRow';
+                $sJoinClause = "LEFT JOIN `sys_form_displays` AS `td` ON `tf`.`object`=`td`.`object` ";
+                $sWhereClause = $this->prepare(" AND `td`.`object`=? AND `td`.`display_name`=? ", $aParams['object'], $aParams['display']);
                 break;
             case 'all':
@@ -76 +78 @@
                 $sLimitClause = "LIMIT 1";
                 break;
+            case 'by_object_display':
+                $aMethod['name'] = 'getRow';
+                $sWhereClause = $this->prepare(" AND `td`.`object`=? AND `td`.`display_name`=? ", $aParams['object'], $aParams['display']);
+                $sLimitClause = "LIMIT 1";
+                break;
             case 'by_name':
-                $aMethod['name'] = 'getRow';
                 $sWhereClause = $this->prepare(" AND `td`.`display_name`=? ", $aParams['value']);
                 $sLimitClause = "LIMIT 1";
@@ -111 +117 @@
             LIMIT 1";
         return (int)$this->getOne($sQuery);
+    }
+
+    function isField($sObject, $sName) {
+        $sSql = $this->prepare("SELECT `id` FROM `sys_form_inputs` WHERE `object`=? AND `name`=? LIMIT 1", $sObject, $sName);
+        return (int)$this->getOne($sSql) > 0;
     }
 
@@ -134 +145 @@
                 $sWhereClause = $this->prepare(" AND `tdi`.`id`=? ", $aParams['value']);
                 break;
-            case 'by_id_object':
+            case 'by_object_id':
                 $aMethod['name'] = 'getRow';
                 $sSelectClause = "`ti`.*, `tdi`.`id` AS `di_id`, `tdi`.`display_name` AS `display_name`";
-                $sWhereClause = $this->prepare(" AND `tdi`.`id`=? AND `ti`.`object`=? ", $aParams['id'], $aParams['object']);
-                break;
-            case 'by_display_name':
-                $sWhereClause = $this->prepare(" AND `tdi`.`display_name`=? ", $aParams['value']);
-                break;
-            case 'by_object_display_names':
+                $sWhereClause = $this->prepare(" AND `ti`.`object`=? AND `tdi`.`id`=? ", $aParams['object'], $aParams['id']);
+                break;
+            case 'by_object_display':
                 $sWhereClause = $this->prepare(" AND `ti`.`object`=? AND `tdi`.`display_name`=? ", $aParams['object'], $aParams['display']);
                 break;
@@ -181 +189 @@
     }
 
-    function checkFieldsInDisplays($sDisplayName) {
-        $aDisplay = array();
-        $this->getDisplays(array('type' => 'by_name', 'value' => $sDisplayName), $aDisplay, false);
-        if(empty($aDisplay) || !is_array($aDisplay))
-            return false;
-
-        $sSql = $this->prepare("INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`) SELECT ? AS `display_name`,`ti`.`name` AS `input_name`  FROM `sys_form_inputs` AS `ti` LEFT JOIN `sys_form_display_inputs` AS `tdi` ON  `ti`.`name`=`tdi`.`input_name` AND `tdi`.`display_name`=? WHERE 1 AND `ti`.`object`=? AND `tdi`.`id` IS NULL", $sDisplayName, $sDisplayName, $aDisplay['object']);
+    function checkFieldsInDisplays($sObject, $sDisplayName) {
+        $sSql = $this->prepare("INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`) SELECT ? AS `display_name`,`ti`.`name` AS `input_name` FROM `sys_form_inputs` AS `ti` LEFT JOIN `sys_form_display_inputs` AS `tdi` ON  `ti`.`name`=`tdi`.`input_name` AND `tdi`.`display_name`=? WHERE 1 AND `ti`.`object`=? AND `tdi`.`id` IS NULL", $sDisplayName, $sDisplayName, $sObject);
         return (int)$this->query($sSql) > 0;
     }
@@ -309 +312 @@
         return (int)$this->getOne($sSql);
     }
+
+    function alterAdd($sTable, $sField, $sType) {
+        $sSql = "ALTER TABLE `" . $sTable . "` ADD `" . $sField . "` " . $sType;
+        $this->query($sSql);
+    }
+
+    function alterRemove($sTable, $sField) {
+        $sSql = "ALTER TABLE `" . $sTable . "` DROP `" . $sField . "`";
+        $this->query($sSql);
+    }
 }
 /** @} */

trunk/studio/js/forms_fields.js

@@ -19 +19 @@
 
 BxDolStudioFormsFields.prototype.onChangeDisplay = function() {
-    var sDisplay = $('#bx-grid-display-' + this.sObjNameGrid).val();
-    document.location.href = this.sPageUrl + (sDisplay.length > 0 ? '&display=' + sDisplay : ''); 
+    var aValue = $('#bx-grid-display-' + this.sObjNameGrid).val().split(this.sParamsDivider);
+
+    document.location.href = this.sPageUrl + (aValue.length == 2 ? '&object=' + aValue[0] + '&display=' + aValue[1] : ''); 
 };
 

trunk/studio/templates/base/scripts/BxBaseStudioFormsDisplays.php

@@ -167 +167 @@
     protected function _getCellFields ($mixedValue, $sKey, $aField, $aRow) {
         $aFields = array();
-        $this->oDb->getFields(array('type' => 'by_object_display_names', 'object' => $aRow['object'], 'display' => $aRow['display_name']), $aFields, false);
+        $this->oDb->getFields(array('type' => 'by_object_display', 'object' => $aRow['object'], 'display' => $aRow['display_name']), $aFields, false);
 
         $mixedValue = $this->_oTemplate->parseHtmlByName('bx_a.html', array(
-            'href' => BX_DOL_URL_STUDIO . 'builder_forms.php?page=fields&display=' . $aRow['display_name'],
+            'href' => BX_DOL_URL_STUDIO . 'builder_forms.php?page=fields&object=' . $aRow['object'] . '&display=' . $aRow['display_name'],
             'title' => _t('_adm_form_txt_displays_manage_fields'),
             'bx_repeat:attrs' => array(),

trunk/studio/templates/base/scripts/BxBaseStudioFormsField.php

@@ -19 +19 @@
     protected $aForm;
 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm = array(
@@ -99 +99 @@
     }
 
-    function getCode($sAction, $sObject, $sDisplay) {
+    function getCode($sAction, $sObject) {
         $sFunction = 'getCode' . $this->getClassName($sAction);
         if(method_exists($this, $sFunction))
-            return $this->$sFunction($sAction, $sObject, $sDisplay);
+            return $this->$sFunction($sAction, $sObject);
 
         return false;
     }
 
-    protected function getCodeAdd($sAction, $sObject, $sDisplay) {
-        $aForm = $this->getFormAdd($sAction, $sObject, $sDisplay);
+    protected function getCodeAdd($sAction, $sObject) {
+        $aForm = $this->getFormAdd($sAction, $sObject);
         $oForm = new BxTemplStudioFormView($aForm);
 
@@ -116 +116 @@
         $oForm->initChecker();
         if($oForm->isSubmittedAndValid()) {
-            $sName = $oForm->getCleanValue('name');
-            BxDolForm::setSubmittedValue('name', $this->getSystemName($sName), $oForm->aFormAttrs['method']);
+            $sFormObject = $oForm->getCleanValue('object');
+
+            $sName = $this->getSystemName($oForm->getCleanValue('name'));
+            if($this->oDb->isField($sFormObject, $sName))
+                return false;
+
+            BxDolForm::setSubmittedValue('name', $sName, $oForm->aFormAttrs['method']);
 
             $bCaption = false;
@@ -123 +128 @@
             if(($bCaption = isset($oForm->aInputs['caption'])) === true) {
                 $sTitleValue = $oForm->getCleanValue('caption');
-                $sTitleKey = '_sys_form_txt_caption_' . $this->getSystemName($sTitleValue);
+                $sTitleKey = '_sys_form_txt_caption_' . $this->getSystemName($sFormObject . ' ' . $sTitleValue);
                 BxDolForm::setSubmittedValue('caption', $sTitleKey, $oForm->aFormAttrs['method']);
             }
@@ -148 +153 @@
             $sCheckerErrorValue = "";
             if(($bCheckError = isset($oForm->aInputs['checker_error'])) === true) {
-                $sInputObject = $oForm->getCleanValue('object');
                 $sInputName = $oForm->getCleanValue('name');
-                $sCheckerErrorKey = '_adm_form_txt_field_checker_error_' . $this->getSystemName($sInputObject . ' ' . $sInputName);
+                $sCheckerErrorKey = '_adm_form_txt_field_checker_error_' . $this->getSystemName($sFormObject . ' ' . $sInputName);
                 $sCheckerErrorValue = $oForm->getCleanValue('checker_error');
 
@@ -172 +176 @@
                 return false;
 
+            $this->alterAdd($sName);
+
             $oLanguages = BxDolStudioLanguagesUtils::getInstance();
             if($bCaption)
@@ -181 +187 @@
         }
         else
-            return BxTemplStudioFunctions::getInstance()->popupBox('adm-form-field-add-' . $sDisplay . '-popup', _t('_adm_form_txt_field_add_popup'), BxDolStudioTemplate::getInstance()->parseHtmlByName('form_add_field.html', array(
+            return BxTemplStudioFunctions::getInstance()->popupBox('adm-form-field-add-' . $this->aParams['display'] . '-popup', _t('_adm_form_txt_field_add_popup'), BxDolStudioTemplate::getInstance()->parseHtmlByName('form_add_field.html', array(
                 'form_id' => $aForm['form_attrs']['id'],
                 'form' => $oForm->getCode(),
@@ -189 +195 @@
     }
 
-    protected function getCodeEdit($sAction, $sObject, $sDisplay) {
-        $aForm = $this->getFormEdit($sAction, $sObject, $sDisplay);
+    protected function getCodeEdit($sAction, $sObject) {
+        $aForm = $this->getFormEdit($sAction, $sObject);
         $oForm = new BxTemplStudioFormView($aForm);
 
@@ -198 +204 @@
         $oForm->initChecker();
         if($oForm->isSubmittedAndValid()) {
+            $sName = $oForm->getCleanValue('name');
+
             $sTitleValue = '';
             if(($bCaption = isset($oForm->aInputs['caption'])) === true) {
@@ -249 +257 @@
                 return false;
 
+            $this->alterRemove($sName);
+            $this->alterAdd($sName);
+
             $oLanguages = BxDolStudioLanguagesUtils::getInstance();
 
@@ -267 +278 @@
     }
 
-    protected function getFormAdd($sAction, $sObject, $sDisplay) {
+    protected function getFormAdd($sAction, $sObject) {
         $aForm = $this->aForm;
-        $aForm['form_attrs']['id'] = 'adm-form-field-add-' . $sDisplay;
-        $aForm['form_attrs']['action'] = BX_DOL_URL_ROOT . 'grid.php?o=' . $sObject . '&a=' . $sAction . '&display=' . $sDisplay;
-
-        if(isset($aForm['inputs']['object'])) {
-            $aDisplay = array();
-            $this->oDb->getDisplays(array('type' => 'by_name', 'value' => $sDisplay), $aDisplay, false);
-            if(!empty($aDisplay))
-                $aForm['inputs']['object']['value'] = $aDisplay['object']; 
-        }
+        $aForm['form_attrs']['id'] = 'adm-form-field-add-' . $this->aParams['display'];
+        $aForm['form_attrs']['action'] = BX_DOL_URL_ROOT . 'grid.php?o=' . $sObject . '&a=' . $sAction . '&object=' . $this->aParams['object'] . '&display=' . $this->aParams['display'];
+
+        if(isset($aForm['inputs']['object']))
+            $aForm['inputs']['object']['value'] = $this->aParams['object'];
 
         return $aForm;
     }
 
-    protected function getFormEdit($sAction, $sObject, $sDisplay) {
+    protected function getFormEdit($sAction, $sObject) {
         $aForm = $this->aForm;
-        $aForm['form_attrs']['id'] = 'adm-form-field-edit-' . $sDisplay;
-        $aForm['form_attrs']['action'] = BX_DOL_URL_ROOT . 'grid.php?o=' . $sObject . '&a=' . $sAction . '&display=' . $sDisplay . '&di_id=' . (int)$this->aField['di_id'];
+        $aForm['form_attrs']['id'] = 'adm-form-field-edit-' . $this->aParams['display'];
+        $aForm['form_attrs']['action'] = BX_DOL_URL_ROOT . 'grid.php?o=' . $sObject . '&a=' . $sAction . '&object=' . $this->aParams['object'] . '&display=' . $this->aParams['display'] . '&di_id=' . (int)$this->aField['di_id'];
 
         foreach($aForm['inputs'] as $sKey => $aInput)
@@ -399 +406 @@
     }
     protected function getCheckerFields() {
-        return array(
+        $aResult = array(
             'checker_func' => array(
                 'type' => 'select',
@@ -407 +414 @@
                 'value' => '',
                 'values' => array(
-                    array('key' => '', 'value' => _t('_adm_form_txt_field_checker_empty')),
-                    array('key' => 'avail', 'value' => _t('_adm_form_txt_field_checker_avail')),
-                    array('key' => 'length', 'value' => _t('_adm_form_txt_field_checker_length')),
-                    array('key' => 'date', 'value' => _t('_adm_form_txt_field_checker_date')),
-                    array('key' => 'date_time', 'value' => _t('_adm_form_txt_field_checker_date_time')),
-                    array('key' => 'preg', 'value' => _t('_adm_form_txt_field_checker_preg')),
-                    array('key' => 'email', 'value' => _t('_adm_form_txt_field_checker_email')),
-                    array('key' => 'captcha', 'value' => _t('_adm_form_txt_field_checker_captcha')),
-                    array('key' => 'no_spam', 'value' => _t('_adm_form_txt_field_checker_no_spam'))
+                    array('key' => '', 'value' => _t('_adm_form_txt_field_checker_empty'))
                 ),
                 'required' => '1',
@@ -519 +518 @@
             ),
         );
+
+        foreach($this->aCheckFunctions as $sCheckFunction)
+            $aResult['checker_func']['values'][] = array('key' => $sCheckFunction, 'value' => _t('_adm_form_txt_field_checker_' . $sCheckFunction));
+
+        return $aResult;
     }
 
@@ -569 +573 @@
 
 class BxBaseStudioFormsFieldBlockHeader extends BxBaseStudioFormsField {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm = array(
@@ -680 +684 @@
 
 class BxBaseStudioFormsFieldValue extends BxBaseStudioFormsFieldBlockHeader {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'value';
@@ -708 +712 @@
 
 class BxBaseStudioFormsFieldText extends BxBaseStudioFormsFieldBlockHeader {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg', 'email');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'varchar(255)';
 
         $this->aForm['inputs']['type']['value'] = 'text';
@@ -753 +761 @@
             )
         );
-        
+
         $aFields = array_merge($aFields, $this->getCheckerFields());
 
@@ -765 +773 @@
 
 class BxBaseStudioFormsFieldPassword extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'password';
@@ -774 +784 @@
 
 class BxBaseStudioFormsFieldTextarea extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'text';
 
         $this->aForm['inputs']['type']['value'] = 'textarea';
@@ -805 +819 @@
 
 class BxBaseStudioFormsFieldNumber extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'int(11)';
 
         $this->aForm['inputs']['type']['value'] = 'number';
@@ -814 +832 @@
 
 class BxBaseStudioFormsFieldDatepicker extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('date');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'int(11)';
 
         $this->aForm['inputs']['type']['value'] = 'date';
@@ -823 +845 @@
 
 class BxBaseStudioFormsFieldDatetime extends BxBaseStudioFormsFieldDatepicker {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('date_time');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'int(11)';
 
         $this->aForm['inputs']['type']['value'] = 'datetime';
@@ -832 +858 @@
 
 class BxBaseStudioFormsFieldCheckbox extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'checkbox';
         $this->aForm['inputs']['type_display']['value'] = 'checkbox';
+        $this->aForm['inputs']['value']['caption'] = _t('_adm_form_txt_field_value_checkbox');
+        $this->aForm['inputs']['value']['info'] = _t('_adm_form_dsc_field_value_checkbox');
 
         $aFields = array(
@@ -856 +886 @@
 
 class BxBaseStudioFormsFieldSwitcher extends BxBaseStudioFormsFieldCheckbox {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'switcher';
@@ -865 +897 @@
 
 class BxBaseStudioFormsFieldFile extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'file';
@@ -878 +912 @@
 
 class BxBaseStudioFormsFieldSlider extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'int(11)';
 
         $this->aForm['inputs']['type']['value'] = 'slider';
@@ -932 +970 @@
 
 class BxBaseStudioFormsFieldDoublerange extends BxBaseStudioFormsFieldSlider {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'varchar(255)';
 
         $this->aForm['inputs']['type']['value'] = 'doublerange';
@@ -941 +983 @@
 
 class BxBaseStudioFormsFieldHidden extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg', 'date', 'date_time', 'email');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'hidden';
@@ -962 +1006 @@
 
 class BxBaseStudioFormsFieldButton extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'button';
         $this->aForm['inputs']['type_display']['value'] = 'button';
-
+        $this->aForm['inputs']['value']['caption'] = _t('_adm_form_txt_field_value_button');
+        $this->aForm['inputs']['value']['info'] = _t('_adm_form_dsc_field_value_button');
+ 
         unset(
             $this->aForm['inputs']['caption'], 
@@ -983 +1029 @@
 
 class BxBaseStudioFormsFieldReset extends BxBaseStudioFormsFieldButton {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'reset';
@@ -992 +1038 @@
 
 class BxBaseStudioFormsFieldSubmit extends BxBaseStudioFormsFieldButton {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'submit';
@@ -1001 +1047 @@
 
 class BxBaseStudioFormsFieldImage extends BxBaseStudioFormsFieldButton {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'image';
@@ -1037 +1083 @@
 
 class BxBaseStudioFormsFieldSelect extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'int(11)';
 
         $this->aForm['inputs']['type']['value'] = 'select';
@@ -1068 +1118 @@
 
 class BxBaseStudioFormsFieldRadioSet extends BxBaseStudioFormsFieldSelect {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'int(11)';
 
         $this->aForm['inputs']['type']['value'] = 'radio_set';
@@ -1077 +1131 @@
 
 class BxBaseStudioFormsFieldSelectMultiple extends BxBaseStudioFormsFieldSelect {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'varchar(255)';
 
         $this->aForm['inputs']['type']['value'] = 'select_multiple';
@@ -1086 +1144 @@
 
 class BxBaseStudioFormsFieldCheckboxSet extends BxBaseStudioFormsFieldSelect {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('avail', 'length', 'preg');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'varchar(255)';
 
         $this->aForm['inputs']['type']['value'] = 'checkbox_set';
@@ -1095 +1157 @@
 
 class BxBaseStudioFormsFieldCustom extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
+
+        $this->aParams['table_field_type'] = 'varchar(255)';
 
         $this->aForm['inputs']['type']['value'] = 'custom';
@@ -1114 +1178 @@
 
 class BxBaseStudioFormsFieldInputSet extends BxBaseStudioFormsFieldCustom {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'input_set';
@@ -1137 +1201 @@
 
 class BxBaseStudioFormsFieldCaptcha extends BxBaseStudioFormsFieldText {
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    protected $aCheckFunctions = array('captcha');
+
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
 
         $this->aForm['inputs']['type']['value'] = 'captcha';

trunk/studio/templates/base/scripts/BxBaseStudioFormsFields.php

@@ -11 +11 @@
 
 bx_import('BxDolStudioFormsFields');
+bx_import('BxTemplStudioFormsField');
 
 define('BX_DOL_STUDIO_FORMS_FIELDS_JS_OBJECT', 'oBxDolStudioFormsFields');
@@ -26 +27 @@
             $sType = bx_process_input($mixedType);
 
-        bx_import('BxTemplStudioFormsField');
         $sClass = 'BxTemplStudioFormsField' . $this->getClassName($sType);
-        $oClass = new $sClass();
-
-        $mixedResult = $oClass->getCode($sAction, $this->_sObject, $this->sDisplay);
+        $oClass = new $sClass(array('object' => $this->sObject, 'display' => $this->sDisplay));
+
+        $mixedResult = $oClass->getCode($sAction, $this->_sObject);
         if(is_string($mixedResult))
             $this->_echoResultJson(array('popup' => $mixedResult), true);
@@ -55 +55 @@
         $iId = $aIds[0];
 
-        $aDisplay = array();
-        $this->oDb->getDisplays(array('type' => 'by_name', 'value' => $this->sDisplay), $aDisplay, false);
-        if(!is_array($aDisplay) || empty($aDisplay)){
+        $aField = array();
+        $this->oDb->getFields(array('type' => 'by_object_id', 'object' => $this->sObject, 'id' => (int)$iId), $aField, false);
+        if(empty($aField) || !is_array($aField)) {
             $this->_echoResultJson(array());
             exit;
         }
 
-        $aField = array();
-        $this->oDb->getFields(array('type' => 'by_id_object', 'id' => $iId, 'object' => $aDisplay['object']), $aField, false);
-        if(!is_array($aField) || empty($aField)) {
-            $this->_echoResultJson(array());
-            exit;
-        }
-
-        bx_import('BxTemplStudioFormsField');
         $sClass = "BxTemplStudioFormsField" . $this->getClassName($aField['type']);
         if(!class_exists($sClass)) {
@@ -76 +68 @@
         }
 
-        $oClass = new $sClass($aField);
-        $mixedResult = $oClass->getCode($sAction, $this->_sObject, $this->sDisplay);
+        $oClass = new $sClass(array('object' => $this->sObject, 'display' => $this->sDisplay), $aField);
+        $mixedResult = $oClass->getCode($sAction, $this->_sObject);
         if(is_string($mixedResult))
             $this->_echoResultJson(array('popup' => $mixedResult), true);
@@ -96 +88 @@
         }
 
-        $aDisplay = array();
-        $this->oDb->getDisplays(array('type' => 'by_name', 'value' => $this->sDisplay), $aDisplay, false);
-        if(!is_array($aDisplay) || empty($aDisplay)){
-            $this->_echoResultJson(array());
-            exit;
-        }
-        
         $aIdsAffected = array ();
         foreach($aIds as $iId) {
             $aField = array();
-            $iField = $this->oDb->getFields(array('type' => 'by_id_object', 'id' => (int)$iId, 'object' => $aDisplay['object']), $aField);
-            if($iField != 1 || empty($aField))
+            $this->oDb->getFields(array('type' => 'by_object_id', 'object' => $this->sObject, 'id' => (int)$iId), $aField, false);
+            if(empty($aField) || !is_array($aField))
                 continue;
 
@@ -113 +98 @@
                 continue;
 
+            $sClass = 'BxTemplStudioFormsField' . $this->getClassName($aField['type']);
+            $oClass = new $sClass(array('object' => $this->sObject, 'display' => $this->sDisplay));
+        
             if((int)$this->_delete($iId) <= 0 || !$this->oDb->deleteFieds(array('type' => 'by_id', 'value' => $aField['id'])))
                 continue;
+
+            $oClass->alterRemove($aField['name']);
 
             bx_import('BxDolStudioLanguagesUtils');
@@ -197 +187 @@
                 'onChange' => 'javascript:' . $this->getJsObject() . '.onChangeDisplay()'
             ),
-            'value' => $this->sDisplay,
+            'value' => $this->sObject . $this->sParamsDivider . $this->sDisplay,
             'values' => array(
                 array('key' => '', 'value' => _t('_adm_form_txt_select_display')),
@@ -214 +204 @@
 
             foreach($aDisplays as $aDisplay)
-                $aInputDisplays['values'][] = array('key' => $aDisplay['name'], 'value' => _t($aDisplay['title']));
+                $aInputDisplays['values'][] = array('key' => $aDisplay['object'] . $this->sParamsDivider . $aDisplay['name'], 'value' => _t($aDisplay['title']));
 
             if(count($aDisplays) > 0)

trunk/studio/templates/tmpl_uni/scripts/BxTemplStudioFormsField.php

@@ -13 +13 @@
 
 class BxTemplStudioFormsField extends BxBaseStudioFormsField { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldBlockHeader extends BxBaseStudioFormsFieldBlockHeader { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldValue extends BxBaseStudioFormsFieldValue { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldText extends BxBaseStudioFormsFieldText { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldPassword extends BxBaseStudioFormsFieldPassword { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldTextarea extends BxBaseStudioFormsFieldTextarea { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldNumber extends BxBaseStudioFormsFieldNumber { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldDatepicker extends BxBaseStudioFormsFieldDatepicker { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldDatetime extends BxBaseStudioFormsFieldDatetime { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldCheckbox extends BxBaseStudioFormsFieldCheckbox { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldSwitcher extends BxBaseStudioFormsFieldSwitcher { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldFile extends BxBaseStudioFormsFieldFile { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldSlider extends BxBaseStudioFormsFieldSlider { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldDoublerange extends BxBaseStudioFormsFieldDoublerange { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldHidden extends BxBaseStudioFormsFieldHidden { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldButton extends BxBaseStudioFormsFieldButton { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldReset extends BxBaseStudioFormsFieldReset { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldSubmit extends BxBaseStudioFormsFieldSubmit { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldImage extends BxBaseStudioFormsFieldImage { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldSelect extends BxBaseStudioFormsFieldSelect { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldSelectMultiple extends BxBaseStudioFormsFieldSelectMultiple { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldCheckboxSet extends BxBaseStudioFormsFieldCheckboxSet { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldRadioSet extends BxBaseStudioFormsFieldRadioSet { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldCustom extends BxBaseStudioFormsFieldCustom { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldInputSet extends BxBaseStudioFormsFieldInputSet { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }
 
 class BxTemplStudioFormsFieldCaptcha extends BxBaseStudioFormsFieldCaptcha { 
-    function __construct($aField = array()) {
-        parent::__construct($aField);
+    function __construct($aParams = array(), $aField = array()) {
+        parent::__construct($aParams, $aField);
     }
 }