Changeset 15969

Timestamp:

02/09/12 19:47:07 (4 months ago)

Author:

Anton Lesnikov

Message:

1. Language key removing in Studio -> Page Builder -> Delete Block.
2. Visible For Levels feature unification.

Location:

trunk

Files:

• install/sql/v70.sql (modified) (2 diffs)
• modules/boonex/english/install/data/langs/en.xml (modified) (4 diffs)
• studio/classes/BxDolStudioFormsQuery.php (modified) (1 diff)
• studio/js/forms_fields.js (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioBuilderPage.php (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioFormsFields.php (modified) (3 diffs)
• studio/templates/base/scripts/BxBaseStudioNavigationItems.php (modified) (2 diffs)

trunk/install/sql/v70.sql

@@ -2869 +2869 @@
 ('sys_studio_forms_fields', 'order', '', '1%', '', '', 1),
 ('sys_studio_forms_fields', 'switcher', '', '9%', '', '', 2),
-('sys_studio_forms_fields', 'title', '_adm_form_txt_fields_title', '40%', '53', '', 3),
+('sys_studio_forms_fields', 'title', '_adm_form_txt_fields_title', '30%', '43', '', 3),
 ('sys_studio_forms_fields', 'type', '_adm_form_txt_fields_type', '15%', '13', '', 4),
 ('sys_studio_forms_fields', 'module', '_adm_form_txt_fields_module', '15%', '13', '', 5),
-('sys_studio_forms_fields', 'actions', '', '20%', '', '', 6),
+('sys_studio_forms_fields', 'visible_for_levels', '_adm_form_txt_fields_visible', '10%', '10', '', 6),
+('sys_studio_forms_fields', 'actions', '', '20%', '', '', 7),
 ('sys_studio_forms_pre_lists', 'title', '_adm_form_txt_pre_lists_title', '25%', '28', '', 1),
 ('sys_studio_forms_pre_lists', 'key', '_adm_form_txt_pre_lists_key', '20%', '23', '', 2),
@@ -2927 +2928 @@
 ('sys_studio_forms_fields', 'single', 'edit', '', 'document--pencil.png', 0, 1),
 ('sys_studio_forms_fields', 'single', 'delete', '', 'cross.png', 1, 2),
+('sys_studio_forms_fields', 'single', 'show_to', '_adm_form_btn_fields_visible', '', 0, 3),
 ('sys_studio_forms_fields', 'independent', 'add', '_adm_form_btn_fields_create', '', 0, 1),
 ('sys_studio_forms_pre_lists', 'independent', 'add', '_adm_form_btn_pre_lists_create', '', 0, 1),

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

@@ -2151 +2151 @@
     <string name="_adm_nav_txt_all_sets"><![CDATA[All Sets]]></string>
     <string name="_adm_nav_txt_manage_items"><![CDATA[Manage actions]]></string>
+    <string name="_adm_nav_txt_manage_visibility"><![CDATA[Manage visibility settings]]></string>
     <string name="_adm_nav_txt_n_items"><![CDATA[{0} items]]></string>
     <string name="_adm_nav_txt_select_set"><![CDATA[Select Set...]]></string>
@@ -2241 +2242 @@
     <string name="_adm_nav_txt_items_show_to_popup"><![CDATA[Show "{0}" menu item to: ]]></string>
     <string name="_adm_nav_err_items_show_to"><![CDATA[Cannot update item]]></string>
-    <string name="_adm_nav_txt_block_visible_for"><![CDATA[Visible For]]></string>
-    <string name="_adm_nav_txt_block_visible_for_all"><![CDATA[Anyone]]></string>
-    <string name="_adm_nav_txt_block_visible_for_selected"><![CDATA[Selected levels]]></string>
+    <string name="_adm_nav_txt_items_visible_for"><![CDATA[Visible For]]></string>
+    <string name="_adm_nav_txt_items_visible_for_all"><![CDATA[Anyone]]></string>
+    <string name="_adm_nav_txt_items_visible_for_selected"><![CDATA[Selected levels]]></string>
     <string name="_adm_nav_txt_items_visible_for_levels"><![CDATA[Select Levels]]></string>
     <string name="_adm_nav_dsc_items_visible_for_levels"><![CDATA[Select user levels that can see this menu item]]></string>
@@ -2266 +2267 @@
     <string name="_adm_form_txt_fields_type"><![CDATA[Type]]></string>
     <string name="_adm_form_txt_fields_module"><![CDATA[Module]]></string>
+    <string name="_adm_form_txt_fields_visible"><![CDATA[Visible For]]></string>
+    <string name="_adm_form_btn_fields_visible"><![CDATA[Visibile For]]></string>
+    <string name="_adm_form_txt_fields_manage_visibility"><![CDATA[Manage visibility settings]]></string>
+    <string name="_adm_form_txt_fields_anyone"><![CDATA[Anyone]]></string>
+    <string name="_adm_form_txt_fields_n_user_levels"><![CDATA[{0} User Levels]]></string>
     <string name="_adm_form_txt_forms_manage_displays"><![CDATA[Manage displays]]></string>
     <string name="_adm_form_txt_forms_n_displays"><![CDATA[{0} displays]]></string>
@@ -2305 +2311 @@
     <string name="_adm_form_txt_field_edit_popup"><![CDATA[Edit "{0}" Field]]></string>
     <string name="_adm_form_err_field_edit"><![CDATA[Cannot update field]]></string>
-    <string name="_adm_from_err_fields_delete"><![CDATA[Cannot delete field]]></string>
+    <string name="_adm_from_err_field_delete"><![CDATA[Cannot delete field]]></string>
+    <string name="_adm_form_txt_field_show_to_popup"><![CDATA[Show "{0}" menu item to: ]]></string>
+    <string name="_adm_form_err_field_show_to"><![CDATA[Cannot update field]]></string>
+    <string name="_adm_form_txt_field_visible_for"><![CDATA[Visible For]]></string>
+    <string name="_adm_form_txt_field_visible_for_all"><![CDATA[Anyone]]></string>
+    <string name="_adm_form_txt_field_visible_for_selected"><![CDATA[Selected levels]]></string>
+    <string name="_adm_form_txt_field_visible_for_levels"><![CDATA[Select Levels]]></string>
+    <string name="_adm_form_dsc_field_visible_for_levels"><![CDATA[Select user levels that can see this menu item]]></string>
     <string name="_adm_form_btn_field_add"><![CDATA[Add]]></string>
     <string name="_adm_form_btn_field_save"><![CDATA[Save]]></string>

trunk/studio/classes/BxDolStudioFormsQuery.php

@@ -148 +148 @@
             case 'by_object_id':
                 $aMethod['name'] = 'getRow';
-                $sSelectClause = "`ti`.*, `tdi`.`id` AS `di_id`, `tdi`.`display_name` AS `display_name`";
+                $sSelectClause = "`ti`.*, `tdi`.`id` AS `di_id`, `tdi`.`display_name` AS `display_name`, `tdi`.`visible_for_levels` AS `visible_for_levels`";
                 $sWhereClause = $this->prepare(" AND `ti`.`object`=? AND `tdi`.`id`=? ", $aParams['object'], $aParams['id']);
                 break;

trunk/studio/js/forms_fields.js

@@ -53 +53 @@
     }
 };
+
+BxDolStudioFormsFields.prototype.onChangeVisibleFor = function(oSelect) {
+    $('#bx-form-element-visible_for_levels').bx_anim($(oSelect).val() == 'all' ? 'hide' : 'show', this.sAnimationEffect, this.iAnimationSpeed);
+};
 /** @} */

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

@@ -1079 +1079 @@
     protected function actionBlockDelete() {
         $sJsObject = $this->getPageJsObject();
-
         $iId = (int)bx_get('id');
+
+        $aBlock = array();
+        $this->oDb->getBlocks(array('type' => 'by_id', 'value' => $iId), $aBlock, false);
+        if(empty($aBlock) || !is_array($aBlock))
+            return array('msg' => _t('_adm_bp_err_block_not_found'));
+
         if(!$this->oDb->deleteBlocks(array('type' => 'by_id', 'value' => $iId)))
             return array('msg' => _t('_adm_bp_err_block_delete'));
+
+        bx_import('BxDolStudioLanguagesUtils');
+        BxDolStudioLanguagesUtils::getInstance()->deleteLanguageString($aBlock['title']);
 
         return array('eval' => $sJsObject . '.onDeleteBlock(' . $iId . ', oData)');

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

@@ -117 +117 @@
         }
 
-        $this->_echoResultJson($iAffected ? array('grid' => $this->getCode(false), 'blink' => $aIdsAffected) : array('msg' => _t('_adm_from_err_fields_delete')));
+        $this->_echoResultJson($iAffected ? array('grid' => $this->getCode(false), 'blink' => $aIdsAffected) : array('msg' => _t('_adm_from_err_field_delete')));
+    }
+
+    public function performActionShowTo() {
+        $sAction = 'show_to';
+
+        $aIds = bx_get('ids');
+        if(!$aIds || !is_array($aIds)) {
+            $iId = (int)bx_get('id');
+            if(!$iId) {
+                $this->_echoResultJson(array());
+                exit;
+            }
+
+            $aIds = array($iId);
+        }
+
+        $iId = $aIds[0];
+                
+        $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;
+        }
+
+        $aForm = array(
+            'form_attrs' => array(
+                'id' => 'adm-form-field-visibility',
+                'action' => BX_DOL_URL_ROOT . 'grid.php?o=' . $this->_sObject . '&a=' . $sAction . '&object=' . $this->sObject . '&display=' . $this->sDisplay,
+                'method' => 'post'
+            ),
+            'params' => array (
+                'db' => array(
+                    'table' => 'sys_form_display_inputs',
+                    'key' => 'id',
+                    'uri' => '',
+                    'uri_title' => '',
+                    'submit_name' => 'do_submit'
+                ),
+            ),
+            'inputs' => array (
+                'id' => array(
+                    'type' => 'hidden',
+                    'name' => 'id',
+                    'value' => $iId,
+                    'db' => array (
+                        'pass' => 'Int',
+                    ),
+                ),
+                'visible_for' => array(
+                    'type' => 'select',
+                    'name' => 'visible_for',
+                    'caption' => _t('_adm_form_txt_field_visible_for'),
+                    'info' => '',
+                    'value' => $aField['visible_for_levels'] == BX_DOL_INT_MAX ? BX_DOL_STUDIO_VISIBLE_ALL : BX_DOL_STUDIO_VISIBLE_SELECTED,
+                    'values' => array(
+                        array('key' => BX_DOL_STUDIO_VISIBLE_ALL, 'value' => _t('_adm_form_txt_field_visible_for_all')),
+                        array('key' => BX_DOL_STUDIO_VISIBLE_SELECTED, 'value' => _t('_adm_form_txt_field_visible_for_selected')),
+                    ),
+                    'required' => '0',
+                    'attrs' => array(
+                        'onchange' => $this->getJsObject() . '.onChangeVisibleFor(this)'
+                    ),
+                    'db' => array (
+                        'pass' => 'Xss',
+                    )
+                ),
+                'visible_for_levels' => array(
+                    'type' => 'checkbox_set',
+                    'name' => 'visible_for_levels',
+                    'caption' => _t('_adm_form_txt_field_visible_for_levels'),
+                    'info' => _t('_adm_form_dsc_field_visible_for_levels'),
+                    'value' => '',
+                    'values' => array(),
+                    'tr_attrs' => array(
+                        'style' => $aField['visible_for_levels'] == BX_DOL_INT_MAX ? 'display:none' : ''
+                    ),
+                    'db' => array (
+                        'pass' => 'Int',
+                    ),
+                ),
+                'controls' => array(
+                    'name' => 'controls', 
+                    'type' => 'input_set',
+                    array(
+                        'type' => 'submit',
+                        'name' => 'do_submit',
+                        'value' => _t('_adm_form_btn_field_save'),
+                    ),
+                    array (
+                        'type' => 'reset',
+                        'name' => 'close',
+                        'value' => _t('_adm_form_btn_field_cancel'),
+                        'attrs' => array(
+                            'onclick' => "$('.bx-popup-applied:visible').dolPopupHide()",
+                            'class' => 'bx-def-margin-sec-left',
+                        ),
+                    )
+                )
+            )
+        );
+
+        BxDolStudioUtils::getVisibilityValues($aField['visible_for_levels'], $aForm['inputs']['visible_for_levels']['values'], $aForm['inputs']['visible_for_levels']['value']);
+
+        bx_import('BxTemplStudioFormView');
+        $oForm = new BxTemplStudioFormView($aForm);
+        $oForm->initChecker();
+
+        if($oForm->isSubmittedAndValid()) {
+            $iVisibleFor = BxDolStudioUtils::getVisibilityValue($oForm->getCleanValue('visible_for'), $oForm->getCleanValue('visible_for_levels'));
+            BxDolForm::setSubmittedValue('visible_for_levels', $iVisibleFor, $aForm['form_attrs']['method']);
+            unset($oForm->aInputs['visible_for']);
+
+            if($oForm->update($iId) !== false)
+                $aRes = array('grid' => $this->getCode(false), 'blink' => $iId);
+            else
+                $aRes = array('msg' => _t('_adm_form_err_field_show_to'));
+
+            $this->_echoResultJson($aRes, true);
+        }
+        else {
+            bx_import('BxTemplStudioFunctions');
+            $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-form-field-show-to-popup', _t('_adm_form_txt_field_show_to_popup', _t($aField['caption'])), $this->_oTemplate->parseHtmlByName('form_add_field.html', array(
+                'form_id' => $aForm['form_attrs']['id'],
+                'form' => $oForm->getCode(),
+                'object' => $this->_sObject,
+                'action' => $sAction
+            )));
+
+            $this->_echoResultJson(array('popup' => $sContent), true);
+        }
     }
 
@@ -157 +288 @@
     }
 
+    protected function _getCellVisibleForLevels ($mixedValue, $sKey, $aField, $aRow) {
+        if((int)$aRow['editable'] == 0)
+            return '';
+
+        $iCount = BxDolStudioUtils::getVisibilityCount($aRow['visible_for_levels']);
+
+        $mixedValue = $this->_oTemplate->parseHtmlByName('bx_a.html', array(
+            'href' => 'javascript:void(0)',
+            'title' => _t('_adm_form_txt_fields_manage_visibility'),
+            'bx_repeat:attrs' => array(
+                array('key' => 'bx_grid_action_single', 'value' => 'show_to'),
+                array('key' => 'bx_grid_action_data', 'value' => $aRow['id'])
+            ),
+            'content' => $iCount != -1 ? _t('_adm_form_txt_fields_n_user_levels', $iCount) : _t('_adm_form_txt_fields_anyone')
+        ));
+
+        return parent::_getCellDefault ($mixedValue, $sKey, $aField, $aRow);
+    }
+
     protected function _getActionAdd ($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array()) {
         if($this->sDisplay == '')
@@ -176 +326 @@
 
         return  parent::_getActionDefault($sType, $sKey, $a, false, $isDisabled, $aRow);        
+    }
+
+    protected function _getActionShowTo ($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array()) {
+        return '';
     }
 

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

@@ -529 +529 @@
                     'type' => 'select',
                     'name' => 'visible_for',
-                    'caption' => _t('_adm_nav_txt_block_visible_for'),
+                    'caption' => _t('_adm_nav_txt_items_visible_for'),
                     'info' => '',
                     'value' => $aItem['visible_for_levels'] == BX_DOL_INT_MAX ? BX_DOL_STUDIO_VISIBLE_ALL : BX_DOL_STUDIO_VISIBLE_SELECTED,
                     'values' => array(
-                        array('key' => BX_DOL_STUDIO_VISIBLE_ALL, 'value' => _t('_adm_nav_txt_block_visible_for_all')),
-                        array('key' => BX_DOL_STUDIO_VISIBLE_SELECTED, 'value' => _t('_adm_nav_txt_block_visible_for_selected')),
+                        array('key' => BX_DOL_STUDIO_VISIBLE_ALL, 'value' => _t('_adm_nav_txt_items_visible_for_all')),
+                        array('key' => BX_DOL_STUDIO_VISIBLE_SELECTED, 'value' => _t('_adm_nav_txt_items_visible_for_selected')),
                     ),
                     'required' => '0',
@@ -668 +668 @@
         $mixedValue = $this->_oTemplate->parseHtmlByName('bx_a.html', array(
             'href' => 'javascript:void(0)',
-            'title' => _t('_adm_nav_txt_manage_items'),
+            'title' => _t('_adm_nav_txt_manage_visibility'),
             'bx_repeat:attrs' => array(
                 array('key' => 'bx_grid_action_single', 'value' => 'show_to'),