Просмотр исходного кода

#1584 Menu: custom visibility field for menu item

Alex Trofimov 8 лет назад
Родитель
Сommit
7a73045ae1

+ 0 - 2
modules/base/general/classes/BxBaseModGeneralMenuView.php

@@ -35,8 +35,6 @@ class BxBaseModGeneralMenuView extends BxTemplMenu
      */
     protected function _isVisible ($a)
     {
-        if(!parent::_isVisible($a))
-            return false;
         return $this->_oModule->isMenuItemVisible($this->_sObject, $a, $this->_aContentInfo);
     }
 

+ 0 - 2
modules/base/general/classes/BxBaseModGeneralMenuViewActions.php

@@ -70,8 +70,6 @@ class BxBaseModGeneralMenuViewActions extends BxTemplMenuCustom
      */
     protected function _isVisible ($a)
     {
-        if(!parent::_isVisible($a))
-            return false;
         return $this->_oModule->isMenuItemVisible($this->_sObject, $a, $this->_aContentInfo);
     }
 

+ 1 - 1
modules/base/general/classes/BxBaseModGeneralModule.php

@@ -1315,7 +1315,7 @@ class BxBaseModGeneralModule extends BxDolModule
 
         if (!empty($aItem['visibility_custom'])) {
             $oMenu = BxDolMenu::getObjectInstance($sObject);
-            if ($oMenu && !BxDolService::callSerialized($aItem['visibility_custom'], $this->_aMarkers))
+            if ($oMenu && !BxDolService::callSerialized($aItem['visibility_custom'], $oMenu->getMarkers()))
                 return false;
         }