Changeset 15878

Timestamp:

01/15/12 22:47:48 (4 months ago)

Author:

Anton Lesnikov

Message:

Studio -> Form Builder.

Location:

trunk

Files:

• install/sql/v70.sql (modified) (1 diff)
• studio/classes/BxDolStudioFormsQuery.php (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioFormsDisplays.php (modified) (1 diff)

trunk/install/sql/v70.sql

@@ -4571 +4571 @@
 ('sys_studio_nav_import', 'Sql', 'SELECT * FROM `sys_menu_items` WHERE 1 ', 'sys_menu_items', 'id', '', '', '', 5, NULL, 'start_im', '', 'title,link', 'auto', '', 'BxTemplStudioNavigationImport', ''),
 ('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`.`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_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', '');
 

trunk/studio/classes/BxDolStudioFormsQuery.php

@@ -140 +140 @@
                 $sWhereClause = $this->prepare(" AND `tdi`.`display_name`=? ", $aParams['value']);
                 break;
+            case 'by_object_display_names':
+                $sWhereClause = $this->prepare(" AND `ti`.`object`=? AND `tdi`.`display_name`=? ", $aParams['object'], $aParams['display']);
+                break;
             case 'all':
                 break;

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

@@ -167 +167 @@
     protected function _getCellFields ($mixedValue, $sKey, $aField, $aRow) {
         $aFields = array();
-        $this->oDb->getFields(array('type' => 'by_display_name', 'value' => $aRow['display_name']), $aFields, false);
+        $this->oDb->getFields(array('type' => 'by_object_display_names', 'object' => $aRow['object'], 'display' => $aRow['display_name']), $aFields, false);
 
         $mixedValue = $this->_oTemplate->parseHtmlByName('bx_a.html', array(