Changeset 15907

Timestamp:

01/23/12 17:53:24 (4 months ago)

Author:

Alexander Trofimov

Message:

Forms, Menus - some fixes

Location:

trunk

Files:

• inc/classes/BxDolForm.php (modified) (1 diff)
• inc/classes/BxDolMenu.php (modified) (2 diffs)
• templates/base/scripts/BxBaseFormView.php (modified) (1 diff)
• templates/base/scripts/BxBaseMenu.php (modified) (2 diffs)

trunk/inc/classes/BxDolForm.php

@@ -969 +969 @@
      */ 
     protected function _isVisible ($aInput) {
-        bx_import('BxDolAcl');
-        echo $aInput['name'] . ' - ' . BxDolAcl::getInstance()->isMemberLevelInSet($aInput['visible_for_levels']) . '<br />';
+        bx_import('BxDolAcl');        
         return BxDolAcl::getInstance()->isMemberLevelInSet($aInput['visible_for_levels']);
     }

trunk/inc/classes/BxDolMenu.php

@@ -103 +103 @@
         parent::__construct();
 
-        $this->_sObject = $aObject['object'];
+        $this->_sObject = isset($aObject['object']) ? $aObject['object'] : 'bx-menu-obj-' . time() . rand(0, PHP_INT_MAX);
         $this->_aObject = $aObject;
         $this->_oQuery = new BxDolMenuQuery($this->_aObject);
@@ -166 +166 @@
      */ 
     protected function _isSelected ($a) {
-        return $a['module'] == self::$SEL_MODULE && $a['name'] == self::$SEL_NAME ? true : false;
+        return (!isset($a['module']) || $a['module'] == self::$SEL_MODULE) && $a['name'] == self::$SEL_NAME ? true : false;
     }
 

trunk/templates/base/scripts/BxBaseFormView.php

@@ -162 +162 @@
         $sCont = '';
         foreach ($this->aInputs as $aInput)
-            if ($this->_isVisible($aInput)) 
+            if (!isset($aInput['visible_for_levels']) || $this->_isVisible($aInput)) 
                 $sCont .= $this->genRow($aInput);
         

trunk/templates/base/scripts/BxBaseMenu.php

@@ -55 +55 @@
         foreach ($this->_aObject['menu_items'] as $a) {
 
-            if (!$a['active'])
+            if (isset($a['active']) && !$a['active'])
                 continue;
 
-            if (!$this->_isVisible($a))
+            if (isset($a['visible_for_levels']) && !$this->_isVisible($a))
                 continue;
 
@@ -65 +65 @@
 
             $a['class_add'] = $this->_isSelected($a) ? 'bx-menu-tab-active' : '';
-            $a['link'] = $this->_oPermalinks->permalink($a['link']);
+            $a['link'] = isset($a['link']) ? $this->_oPermalinks->permalink($a['link']) : 'javascript:void(0);';
             $a['title'] = _t($a['title']);