Changeset 15967

Timestamp:

02/09/12 00:41:43 (4 months ago)

Author:

Anton Lesnikov

Message:

1. Minor fixes and improvements.
2. Visible For Levels feature unification.

Location:

trunk

Files:

• inc/classes/BxDolAcl.php (modified) (1 diff)
• inc/classes/BxDolAclQuery.php (modified) (3 diffs)
• modules/boonex/english/install/data/langs/en.xml (modified) (4 diffs)
• studio/classes/BxDolStudioUtils.php (modified) (3 diffs)
• studio/js/builder_page.js (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioBuilderPage.php (modified) (6 diffs)
• studio/templates/base/scripts/BxBaseStudioNavigationItems.php (modified) (2 diffs)

trunk/inc/classes/BxDolAcl.php

@@ -316 +316 @@
      * @return array( membershipID_1 => membershipName_1,  membershipID_2 => membershipName_2, ...) if no such memberships, then just array()
      */
-    function getMemberships($bPurchasableOnly = false) {
+    function getMemberships($bPurchasableOnly = false, $bActiveOnly = false) {
+        $sType = 'all_pair';
+        if($bPurchasableOnly)
+            $sType = 'all_active_purchasble_pair';
+        else if($bActiveOnly)
+            $sType = 'all_active_pair';
+
         $aLevels = array();
-        $this->oDb->getLevels(array('type' => ($bPurchasableOnly ? 'all_active_purchasble_pair' : 'all_pair')), $aLevels, false);
+        $this->oDb->getLevels(array('type' => $sType), $aLevels, false);
         return $aLevels;
     }

trunk/inc/classes/BxDolAclQuery.php

@@ -57 +57 @@
                 $sWhereClause .= "AND `tal`.`Active`='yes' AND `tal`.`Purchasable`='yes'";
                 break;
+            case 'all_active_pair':
+                $aMethod['name'] = "getPairs";
+                $aMethod['params'][1] = 'id';
+                $aMethod['params'][2] = 'name';
+                $sWhereClause .= "AND `tal`.`Active`='yes'";
+                break;    
             case 'all_pair':
                 $aMethod['name'] = "getPairs";
@@ -69 +75 @@
         }
 
-        $aMethod['params'][0] = "SELECT 
+        $aMethod['params'][0] = "SELECT SQL_CALC_FOUND_ROWS
                 `tal`.`ID` AS `id`,
                 `tal`.`Name` AS `name`,
@@ -88 +94 @@
             return count($aItems) > 0;
 
-        $sQuery = "SELECT 
-                COUNT(`tal`.`ID`)
-            FROM `sys_acl_levels` AS `tal`" . $sJoinClause . "
-            WHERE 1 " . $sWhereClause . " 
-            LIMIT 1";
-        return $this->getOne($sQuery);
+        return (int)$this->getOne("SELECT FOUND_ROWS()");
     }
 

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

@@ -2473 +2473 @@
     <string name="_adm_bp_txt_block_selected"><![CDATA[blocks selected]]></string>
     <string name="_adm_bp_scs_block_added"><![CDATA[The blocks were successfully added.]]></string>    
-    <string name="_adm_bp_err_block_added"><![CDATA[Cannot add blocks.]]></string>
+    <string name="_adm_bp_err_block_added"><![CDATA[Cannot add block(s)]]></string>
     <string name="_adm_bp_txt_edit_block_popup"><![CDATA[Edit "{0}" Block]]></string>
     <string name="_adm_bp_err_block_edit"><![CDATA[Cannot update block]]></string>
+    <string name="_adm_bp_err_block_delete"><![CDATA[Cannot delete block]]></string>
     <string name="_adm_bp_err_block_not_found"><![CDATA[The requested block cannot be found.]]></string>
     <string name="_adm_bp_err_block_remove_old_image"><![CDATA[Cannot remove an old image]]></string>
@@ -2491 +2492 @@
     <string name="_adm_bp_btn_block_save"><![CDATA[Save]]></string>
     <string name="_adm_bp_btn_block_cancel"><![CDATA[Cancel]]></string>
+    <string name="_adm_bp_btn_block_delete"><![CDATA[Delete]]></string>
     <string name="_adm_bp_txt_block_content_raw"><![CDATA[Content]]></string>
     <string name="_adm_bp_dsc_block_content_raw"><![CDATA[Enter HTML content here]]></string>
@@ -2512 +2514 @@
     <string name="_adm_bp_txt_block_content_service_module"><![CDATA[Module]]></string>
     <string name="_adm_bp_txt_block_content_service_method"><![CDATA[Method]]></string>
-    
     <string name=""><![CDATA[]]></string>
     <string name=""><![CDATA[]]></string>
@@ -2529 +2530 @@
     <string name="_adm_bp_err_page_layout"><![CDATA[Please, select a page layout.]]></string>
     <string name="_adm_bp_txt_page_layout_empty"><![CDATA[Select Layout...]]></string>
-    <string name="_adm_bp_txt_page_visible_for_levels"><![CDATA[User Levels]]></string>
+    <string name="_adm_bp_txt_page_visible_for_levels"><![CDATA[Select Levels]]></string>
     <string name="_adm_bp_dsc_page_visible_for_levels"><![CDATA[Select user levels that can see this page]]></string>
     <string name="_adm_bp_err_page_visible_for_levels"><![CDATA[Visibility setting are determined by custom code or not applicable here.]]></string>

trunk/studio/classes/BxDolStudioUtils.php

@@ -76 +76 @@
     }
 
-    public static function getVisibilityCount($iValue, $aLevels) {
+    public static function getVisibilityCount($iValue) {
         $iResult = 0;
 
@@ -84 +84 @@
         else if($iValue == BX_DOL_INT_MAX)
             return -1;
+
+        bx_import('BxDolAcl');
+        $aLevels = BxDolAcl::getInstance()->getMemberships(false, true);
 
         $iIndex = 1;
@@ -107 +110 @@
     public static function getVisibilityValues($iValue, &$aValuesAll, &$aValuesSelected) {
         bx_import('BxDolAcl');
-        $aLevels = BxDolAcl::getInstance()->getMemberships();
+        $aLevels = BxDolAcl::getInstance()->getMemberships(false, true);
         foreach($aLevels as $iKey => $sValue) {
             if(((int)$iValue & pow(2, (int)$iKey - 1)) != 0)

trunk/studio/js/builder_page.js

@@ -139 +139 @@
 };
 
+BxDolStudioBuilderPage.prototype.onDeleteBlock = function(oData) {
+
+};
+
 /**
  * "Settings" popup methods.

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

@@ -386 +386 @@
     }
 
+    protected function actionPageEdit() {
+        $sJsObject = $this->getPageJsObject();
+        $oTemplate = BxDolStudioTemplate::getInstance();
+
+        $aForm = array(
+            'form_attrs' => array(
+                'id' => 'adm-bp-page-edit',
+                'action' => BX_DOL_URL_STUDIO . 'builder_page.php?bp_action=' . $this->sActionPageEdit . '&type=' . $this->sType . '&page=' . $this->sPage,
+                'method' => 'post'
+            ),
+            'params' => array (
+                'db' => array(
+                    'table' => 'sys_objects_page',
+                    'key' => 'object',
+                    'uri' => '',
+                    'uri_title' => '',
+                    'submit_name' => 'do_submit'
+                ),
+            ),
+            'inputs' => array (
+                'settings' => array(
+                    'type' => 'custom',
+                    'name' => 'settings',
+                    'content' => '',
+                ),
+            )
+        );
+
+        $aSettings = array(
+            array('name' => 'options', 'title' => '_adm_bp_mi_page_options', 'active' => 1),
+            array('name' => 'layout', 'title' => '_adm_bp_mi_page_layout', 'active' => 0),
+            array('name' => 'visibility', 'title' => '_adm_bp_mi_page_visibility', 'active' => 0),
+            array('name' => 'cache', 'title' => '_adm_bp_mi_page_cache', 'active' => 0),
+            array('name' => 'seo', 'title' => '_adm_bp_mi_page_seo', 'active' => 0)
+        );
+
+        $aTmplParams = array(
+            'bx_repeat:menus' => array(),
+            'html_settings_groups_id' => $this->aHtmlIds['settings_groups_id'],
+            'bx_repeat:settings_groups' => array()
+        );
+        foreach($aSettings as $aSetting) {
+            //--- get menu items
+            $aTmplParams['bx_repeat:menus'][] = array(
+                'bx_if:caption' => array(
+                    'condition' => false,
+                    'content' => array()
+                ),
+                'bx_if:item' => array(
+                    'condition' => true,
+                    'content' => array(
+                        'name' => $aSetting['name'],
+                        'bx_if:active' => array(
+                            'condition' => isset($aSetting['active']) && (int)$aSetting['active'] == 1,
+                            'content' => array()
+                        ),
+                        'icon' => '',
+                        'url' => 'javascript:void(0)',
+                        'bx_if:show_onclick' => array(
+                            'condition' => true,
+                            'content' => array(
+                                'onclick' => 'javascript:' . $sJsObject . '.onChangeSettingGroup(\'' . $aSetting['name'] . '\', this);',
+                            )
+                        ),
+                        'caption' => _t($aSetting['title'])
+                    )
+                ),
+            );
+
+            //--- get settings
+            $aTmplParams['bx_repeat:settings_groups'][] = array(
+                'html_settings_group_id' => $this->aHtmlIds['settings_group_id'] .  $aSetting['name'],
+                'bx_if:hidden' => array(
+                    'condition' => $aSetting['active'] != 1,
+                    'content' => array()
+                ),
+                'content' => $this->{'getSettings' . $this->getClassName($aSetting['name'])}() 
+            );
+        }
+
+        $aForm['inputs']['settings']['content'] = $oTemplate->parseHtmlByName('bp_edit_page_form.html', $aTmplParams);
+
+        $oForm = new BxTemplStudioFormView($aForm);
+        $oForm->initChecker();
+
+        $sContent = "";
+        if($oForm->isSubmittedAndValid()) {
+            $aKeys = array_keys($this->aPageRebuild);
+
+            $aFields = array();
+            foreach($aKeys as $sKey)
+                if(($sValue = bx_get($sKey)) !== false)
+                    $aFields[$sKey] = bx_process_input($sValue);
+
+            $sTitleValue = '';
+            if(isset($aFields['title'])) {
+                $sTitleValue = $aFields['title'];
+                $aFields['title'] = $this->aPageRebuild['title'];
+            }
+
+            if(isset($aFields['visible_for_levels']))
+                $aFields['visible_for_levels'] = BxDolStudioUtils::getVisibilityValue(bx_process_input(bx_get('visible_for')), $aFields['visible_for_levels']);
+
+            if($this->oDb->updatePage($this->aPageRebuild['id'], $aFields) !== false) {
+                bx_import('BxDolStudioLanguagesUtils');
+                BxDolStudioLanguagesUtils::getInstance()->updateLanguageString($this->aPageRebuild['title'], $sTitleValue);
+
+                if(isset($aFields['layout_id']) && $aFields['layout_id'] != $this->aPageRebuild['layout_id'] && $this->oDb->resetBlocksByPage($this->sPage) !== false)
+                    return array('eval' => $sJsObject . '.onSaveSettings()');
+
+                return array();
+            }
+            else
+                return array('msg' => _t('_adm_bp_err_save'));
+        }
+
+        bx_import('BxTemplStudioFunctions');
+        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($this->aHtmlIds['edit_popup_id'], _t('_adm_bp_txt_settings_popup'), $oTemplate->parseHtmlByName('bp_edit_page.html', array(
+            'form_id' => $aForm['form_attrs']['id'],
+            'form' => $oForm->getCode()
+        )));
+
+        return array('popup' => $sContent);
+    }
+
     protected function actionPageDelete() {
         bx_import('BxDolStudioLanguagesUtils');
@@ -413 +538 @@
 
         return $aResult;
-    }
-
-    protected function actionPageEdit() {
-        $sJsObject = $this->getPageJsObject();
-        $oTemplate = BxDolStudioTemplate::getInstance();
-
-        $aForm = array(
-            'form_attrs' => array(
-                'id' => 'adm-bp-page-edit',
-                'action' => BX_DOL_URL_STUDIO . 'builder_page.php?bp_action=' . $this->sActionPageEdit . '&type=' . $this->sType . '&page=' . $this->sPage,
-                'method' => 'post'
-            ),
-            'params' => array (
-                'db' => array(
-                    'table' => 'sys_objects_page',
-                    'key' => 'object',
-                    'uri' => '',
-                    'uri_title' => '',
-                    'submit_name' => 'do_submit'
-                ),
-            ),
-            'inputs' => array (
-                'settings' => array(
-                    'type' => 'custom',
-                    'name' => 'settings',
-                    'content' => '',
-                ),
-            )
-        );
-
-        $aSettings = array(
-            array('name' => 'options', 'title' => '_adm_bp_mi_page_options', 'active' => 1),
-            array('name' => 'layout', 'title' => '_adm_bp_mi_page_layout', 'active' => 0),
-            array('name' => 'visibility', 'title' => '_adm_bp_mi_page_visibility', 'active' => 0),
-            array('name' => 'cache', 'title' => '_adm_bp_mi_page_cache', 'active' => 0),
-            array('name' => 'seo', 'title' => '_adm_bp_mi_page_seo', 'active' => 0)
-        );
-
-        $aTmplParams = array(
-            'bx_repeat:menus' => array(),
-            'html_settings_groups_id' => $this->aHtmlIds['settings_groups_id'],
-            'bx_repeat:settings_groups' => array()
-        );
-        foreach($aSettings as $aSetting) {
-            //--- get menu items
-            $aTmplParams['bx_repeat:menus'][] = array(
-                'bx_if:caption' => array(
-                    'condition' => false,
-                    'content' => array()
-                ),
-                'bx_if:item' => array(
-                    'condition' => true,
-                    'content' => array(
-                        'name' => $aSetting['name'],
-                        'bx_if:active' => array(
-                            'condition' => isset($aSetting['active']) && (int)$aSetting['active'] == 1,
-                            'content' => array()
-                        ),
-                        'icon' => '',
-                        'url' => 'javascript:void(0)',
-                        'bx_if:show_onclick' => array(
-                            'condition' => true,
-                            'content' => array(
-                                'onclick' => 'javascript:' . $sJsObject . '.onChangeSettingGroup(\'' . $aSetting['name'] . '\', this);',
-                            )
-                        ),
-                        'caption' => _t($aSetting['title'])
-                    )
-                ),
-            );
-
-            //--- get settings
-            $aTmplParams['bx_repeat:settings_groups'][] = array(
-                'html_settings_group_id' => $this->aHtmlIds['settings_group_id'] .  $aSetting['name'],
-                'bx_if:hidden' => array(
-                    'condition' => $aSetting['active'] != 1,
-                    'content' => array()
-                ),
-                'content' => $this->{'getSettings' . $this->getClassName($aSetting['name'])}() 
-            );
-        }
-
-        $aForm['inputs']['settings']['content'] = $oTemplate->parseHtmlByName('bp_edit_page_form.html', $aTmplParams);
-
-        $oForm = new BxTemplStudioFormView($aForm);
-        $oForm->initChecker();
-
-        $sContent = "";
-        if($oForm->isSubmittedAndValid()) {
-            $aKeys = array_keys($this->aPageRebuild);
-
-            $aFields = array();
-            foreach($aKeys as $sKey)
-                if(($sValue = bx_get($sKey)) !== false)
-                    $aFields[$sKey] = bx_process_input($sValue);
-
-            $sTitleValue = '';
-            if(isset($aFields['title'])) {
-                $sTitleValue = $aFields['title'];
-                $aFields['title'] = $this->aPageRebuild['title'];
-            }
-
-            if(isset($aFields['visible_for_levels']) && is_array($aFields['visible_for_levels'])) {
-                $iHideFrom = 0;
-                foreach($aFields['visible_for_levels'] as $iLevelId)
-                    $iHideFrom += pow(2, (int)$iLevelId - 1);
-                $aFields['visible_for_levels'] = $iHideFrom;
-            }
-
-            if($this->oDb->updatePage($this->aPageRebuild['id'], $aFields) !== false) {
-                bx_import('BxDolStudioLanguagesUtils');
-                BxDolStudioLanguagesUtils::getInstance()->updateLanguageString($this->aPageRebuild['title'], $sTitleValue);
-
-                if(isset($aFields['layout_id']) && $aFields['layout_id'] != $this->aPageRebuild['layout_id'] && $this->oDb->resetBlocksByPage($this->sPage) !== false)
-                    return array('eval' => $sJsObject . '.onSaveSettings()');
-
-                return array();
-            }
-            else
-                return array('msg' => _t('_adm_bp_err_save'));
-        }
-
-        bx_import('BxTemplStudioFunctions');
-        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($this->aHtmlIds['edit_popup_id'], _t('_adm_bp_txt_settings_popup'), $oTemplate->parseHtmlByName('bp_edit_page.html', array(
-            'form_id' => $aForm['form_attrs']['id'],
-            'form' => $oForm->getCode()
-        )));
-
-        return array('popup' => $sContent);
     }
 
@@ -813 +809 @@
                         'attrs' => array(
                             'onclick' => "$('.bx-popup-applied:visible').dolPopupHide()",
+                            'class' => 'bx-def-margin-sec-left',
+                        ),
+                    ),
+                    array (
+                        'type' => 'reset',
+                        'name' => 'close',
+                        'value' => _t('_adm_bp_btn_block_delete'),
+                        'attrs' => array(
+                            'onclick' => $this->getPageJsObject() . ".performAction('block_delete', {id:" . $aBlock['id'] . "})",
                             'class' => 'bx-def-margin-sec-left',
                         ),
@@ -1072 +1077 @@
     }
 
+    protected function actionBlockDelete() {
+        $sJsObject = $this->getPageJsObject();
+
+        $iId = (int)bx_get('id');
+        if(!$this->oDb->deleteBlocks(array('type' => 'by_id', 'value' => $iId)))
+            return array('msg' => _t('_adm_bp_err_block_delete'));
+
+        return array('eval' => $sJsObject . '.onDeleteBlock(' . $iId . ', oData)');
+    }
+
     protected function getSettingsOptions() {
         $aForm = array(
@@ -1170 +1185 @@
     protected function getSettingsVisibility() {
         if((int)$this->aPageRebuild['visible_for_levels_editable'] == 0)
-            $aInput = array(
-                'type' => 'custom',
-                'name' => 'visible_for_levels',
-                'content' => MsgBox(_t('_adm_bp_err_page_visible_for_levels'))
+            $aInputs = array(
+                'visible_for_levels' => array(
+                    'type' => 'custom',
+                    'name' => 'visible_for_levels',
+                    'content' => MsgBox(_t('_adm_bp_err_page_visible_for_levels'))
+                )
             );
         else 
-            $aInput = array(
-                'type' => 'checkbox_set',
-                'name' => 'visible_for_levels',
-                'caption' => _t('_adm_bp_txt_page_visible_for_levels'),
-                'info' => _t('_adm_bp_dsc_page_visible_for_levels'),
-                'value' => '',
-                'values' => array(),
-                'db' => array (
-                    'pass' => 'Int',
+            $aInputs = array(
+                'visible_for' => array(
+                    'type' => 'select',
+                    'name' => 'visible_for',
+                    'caption' => _t('_adm_bp_txt_block_visible_for'),
+                    'info' => '',
+                    'value' => $this->aPageRebuild['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_bp_txt_block_visible_for_all')),
+                        array('key' => BX_DOL_STUDIO_VISIBLE_SELECTED, 'value' => _t('_adm_bp_txt_block_visible_for_selected')),
+                    ),
+                    'required' => '0',
+                    'attrs' => array(
+                        'onchange' => $this->getPageJsObject() . '.onChangeVisibleFor(this)'
+                    ),
+                    'db' => array (
+                        'pass' => 'Xss',
+                    )
+                ),
+                'visible_for_levels' => array(
+                    'type' => 'checkbox_set',
+                    'name' => 'visible_for_levels',
+                    'caption' => _t('_adm_bp_txt_page_visible_for_levels'),
+                    'info' => _t('_adm_bp_dsc_page_visible_for_levels'),
+                    'value' => '',
+                    'values' => array(),
+                    'tr_attrs' => array(
+                        'style' => $this->aPageRebuild['visible_for_levels'] == BX_DOL_INT_MAX ? 'display:none' : ''
+                    ),
+                    'db' => array (
+                        'pass' => 'Int',
+                    )
                 )
             );
@@ -1198 +1238 @@
                 )
             ),
-            'inputs' => array (
-                'visible_for_levels' => $aInput
-            )
-        );
-
-        bx_import('BxDolAcl');
-        $aLevels = BxDolAcl::getInstance()->getMemberships();
-        foreach($aLevels as $iKey => $sValue) {
-            if(((int)$this->aPageRebuild['visible_for_levels'] & pow(2, (int)$iKey - 1)) != 0)
-                $aForm['inputs']['visible_for_levels']['value'][] = $iKey;
-            
-            $aForm['inputs']['visible_for_levels']['values'][$iKey] = _t($sValue);
-        }
+            'inputs' => $aInputs
+        );
+
+        BxDolStudioUtils::getVisibilityValues($this->aPageRebuild['visible_for_levels'], $aForm['inputs']['visible_for_levels']['values'], $aForm['inputs']['visible_for_levels']['value']);
 
         $oForm = new BxTemplStudioFormView($aForm);

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

@@ -13 +13 @@
 
 class BxBaseStudioNavigationItems extends BxDolStudioNavigationItems {
-    private $aMemberships;
-
     function __construct($aOptions, $oTemplate = false) {
         parent::__construct($aOptions, $oTemplate);
-
-        bx_import('BxDolAcl');
-        $this->aMemberships = BxDolAcl::getInstance()->getMemberships();
     }
 
@@ -669 +664 @@
 
     protected function _getCellVisibleForLevels ($mixedValue, $sKey, $aField, $aRow) {
-        $iCount = BxDolStudioUtils::getVisibilityCount($aRow['visible_for_levels'], $this->aMemberships);
+        $iCount = BxDolStudioUtils::getVisibilityCount($aRow['visible_for_levels']);
 
         $mixedValue = $this->_oTemplate->parseHtmlByName('bx_a.html', array(