From 2b7a2f53c18f3304926d20fe7f32e98b0bed992a Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Thu, 12 May 2016 18:51:41 +0200 Subject: [PATCH] Let MenuItemNode and PageNode extend DatabaseObjectDecorator --- com.woltlab.wcf/templates/__menu.tpl | 8 ++--- com.woltlab.wcf/templates/pageMenuMobile.tpl | 6 ++-- .../install/files/acp/templates/boxAdd.tpl | 4 +-- .../install/files/acp/templates/menuAdd.tpl | 2 +- .../files/acp/templates/menuItemAdd.tpl | 4 +-- .../files/acp/templates/menuItemList.tpl | 18 +++++----- .../install/files/acp/templates/pageAdd.tpl | 2 +- .../files/acp/templates/pageHeaderUser.tpl | 4 +-- .../files/acp/templates/pageMenuMobile.tpl | 4 +-- .../files/lib/acp/form/BoxAddForm.class.php | 4 +-- .../lib/acp/form/MenuItemAddForm.class.php | 4 +-- .../lib/acp/form/MenuItemEditForm.class.php | 4 +-- .../lib/data/menu/item/MenuItemNode.class.php | 32 ++++++++--------- .../data/menu/item/MenuItemNodeTree.class.php | 2 +- .../files/lib/data/page/PageNode.class.php | 34 +++++++++---------- .../page/MultiPageCondition.class.php | 2 +- 16 files changed, 65 insertions(+), 69 deletions(-) diff --git a/com.woltlab.wcf/templates/__menu.tpl b/com.woltlab.wcf/templates/__menu.tpl index ceaa11660b..bc8e7b5897 100644 --- a/com.woltlab.wcf/templates/__menu.tpl +++ b/com.woltlab.wcf/templates/__menu.tpl @@ -2,10 +2,10 @@
    {foreach from=$menuItemNodeList item=menuItemNode}
  1. - - {lang}{$menuItemNode->getMenuItem()->title}{/lang} - {if $menuItemNode->getMenuItem()->getOutstandingItems() > 0} - {#$menuItemNode->getMenuItem()->getOutstandingItems()} + + {lang}{$menuItemNode->title}{/lang} + {if $menuItemNode->getOutstandingItems() > 0} + {#$menuItemNode->getOutstandingItems()} {/if} diff --git a/com.woltlab.wcf/templates/pageMenuMobile.tpl b/com.woltlab.wcf/templates/pageMenuMobile.tpl index 1d97e3da99..eb12845ed7 100644 --- a/com.woltlab.wcf/templates/pageMenuMobile.tpl +++ b/com.woltlab.wcf/templates/pageMenuMobile.tpl @@ -10,9 +10,9 @@
      *} {foreach from=$__wcf->getBoxHandler()->getBoxes('mainMenu')[0]->getMenu()->getMenuItemNodeList() item=menuItemNode}
    1. - {assign var=__outstandingItems value=$menuItemNode->getMenuItem()->getOutstandingItems()} - - {lang}{$menuItemNode->getMenuItem()->title}{/lang} + {assign var=__outstandingItems value=$menuItemNode->getOutstandingItems()} + + {lang}{$menuItemNode->title}{/lang} {if $__outstandingItems} {#$__outstandingItems} {/if} diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl index 31c2976177..86f0e3b9aa 100644 --- a/wcfsetup/install/files/acp/templates/boxAdd.tpl +++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl @@ -180,7 +180,7 @@
        {foreach from=$pageNodeList item=pageNode} getDepth() > 1} style="padding-left: {$pageNode->getDepth()*20-20}px"{/if}> - + {/foreach}
      @@ -209,7 +209,7 @@ {foreach from=$pageNodeList item=pageNode} - + {/foreach} {if $errorField == 'linkPageID'} diff --git a/wcfsetup/install/files/acp/templates/menuAdd.tpl b/wcfsetup/install/files/acp/templates/menuAdd.tpl index f042078587..023520371f 100644 --- a/wcfsetup/install/files/acp/templates/menuAdd.tpl +++ b/wcfsetup/install/files/acp/templates/menuAdd.tpl @@ -107,7 +107,7 @@
      diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl index 13b1e001c8..820182bafe 100644 --- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl +++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl @@ -48,7 +48,7 @@ {foreach from=$menuItemNodeList item=menuItemNode} - + {/foreach} {if $errorField == 'parentItemID'} @@ -102,7 +102,7 @@ {foreach from=$pageNodeList item=pageNode} - + {/foreach} {if $errorField == 'pageID'} diff --git a/wcfsetup/install/files/acp/templates/menuItemList.tpl b/wcfsetup/install/files/acp/templates/menuItemList.tpl index f5c8214120..6bf2ce760e 100644 --- a/wcfsetup/install/files/acp/templates/menuItemList.tpl +++ b/wcfsetup/install/files/acp/templates/menuItemList.tpl @@ -30,18 +30,18 @@
        {content} {foreach from=$menuItemNodeList item=menuItemNode} -
      1. +
      2. - {lang}{$menuItemNode->getMenuItem()->title}{/lang} + {lang}{$menuItemNode->title}{/lang} - {if $menuItemNode->getMenuItem()->canDisable()} - + {if $menuItemNode->canDisable()} + {else} - + {/if} - - {if $menuItemNode->getMenuItem()->canDelete()} - + + {if $menuItemNode->canDelete()} + {else} {/if} @@ -50,7 +50,7 @@ -
          {if !$menuItemNode->hasChildren()}
        3. {/if} +
          {if !$menuItemNode->hasChildren()}
        {/if} {if !$menuItemNode->hasChildren() && $menuItemNode->isLastSibling()} {@"
      2. "|str_repeat:$menuItemNode->getOpenParentNodes()} diff --git a/wcfsetup/install/files/acp/templates/pageAdd.tpl b/wcfsetup/install/files/acp/templates/pageAdd.tpl index e2b36d87ae..6b39aa48be 100644 --- a/wcfsetup/install/files/acp/templates/pageAdd.tpl +++ b/wcfsetup/install/files/acp/templates/pageAdd.tpl @@ -72,7 +72,7 @@ {foreach from=$pageNodeList item=pageNode} - + {/foreach} {if $errorField == 'parentPageID'} diff --git a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl index 9fc436451d..a058a9f2aa 100644 --- a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl +++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl @@ -20,8 +20,8 @@
        {foreach from=$__wcf->getFrontendMenu()->getMenuItemNodeList() item=_menuItem} - {if !$_menuItem->getMenuItem()->parentItemID && $_menuItem->getMenuItem()->getPage()} -
      • {$_menuItem->getMenuItem()->getPage()}
        • + {if !$_menuItem->parentItemID && $_menuItem->getPage()} +
      • {$_menuItem->getPage()}
        • {/if} {/foreach}
      diff --git a/wcfsetup/install/files/acp/templates/pageMenuMobile.tpl b/wcfsetup/install/files/acp/templates/pageMenuMobile.tpl index b65583287a..9232702b72 100644 --- a/wcfsetup/install/files/acp/templates/pageMenuMobile.tpl +++ b/wcfsetup/install/files/acp/templates/pageMenuMobile.tpl @@ -51,8 +51,8 @@
        {foreach from=$__wcf->getFrontendMenu()->getMenuItemNodeList() item=_menuItem} - {if !$_menuItem->getMenuItem()->parentItemID && $_menuItem->getMenuItem()->getPage()} -
      1. {$_menuItem->getMenuItem()->getPage()}
        2. + {if !$_menuItem->parentItemID && $_menuItem->getPage()} +
      2. {$_menuItem->getPage()}
        3. {/if} {/foreach}
      diff --git a/wcfsetup/install/files/lib/acp/form/BoxAddForm.class.php b/wcfsetup/install/files/lib/acp/form/BoxAddForm.class.php index 0704dee867..f8b74b6477 100644 --- a/wcfsetup/install/files/lib/acp/form/BoxAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/BoxAddForm.class.php @@ -179,10 +179,10 @@ class BoxAddForm extends AbstractForm { // fetch page handlers foreach ($this->pageNodeList as $pageNode) { - $handler = $pageNode->getPage()->getHandler(); + $handler = $pageNode->getHandler(); if ($handler !== null) { if ($handler instanceof ILookupPageHandler) { - $this->pageHandlers[$pageNode->getPage()->pageID] = $pageNode->getPage()->requireObjectID; + $this->pageHandlers[$pageNode->pageID] = $pageNode->requireObjectID; } } } diff --git a/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php index 58254ff6ac..54e91393f6 100644 --- a/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php @@ -134,10 +134,10 @@ class MenuItemAddForm extends AbstractForm { // fetch page handlers foreach ($this->pageNodeList as $pageNode) { - $handler = $pageNode->getPage()->getHandler(); + $handler = $pageNode->getHandler(); if ($handler !== null) { if ($handler instanceof ILookupPageHandler) { - $this->pageHandlers[$pageNode->getPage()->pageID] = $pageNode->getPage()->requireObjectID; + $this->pageHandlers[$pageNode->pageID] = $pageNode->requireObjectID; } } } diff --git a/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php index 9942216532..7b13274170 100644 --- a/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php @@ -56,10 +56,10 @@ class MenuItemEditForm extends MenuItemAddForm { // fetch page handlers foreach ($this->pageNodeList as $pageNode) { - $handler = $pageNode->getPage()->getHandler(); + $handler = $pageNode->getHandler(); if ($handler !== null) { if ($handler instanceof ILookupPageHandler) { - $this->pageHandlers[$pageNode->getPage()->pageID] = $pageNode->getPage()->requireObjectID; + $this->pageHandlers[$pageNode->pageID] = $pageNode->requireObjectID; } } } diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItemNode.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItemNode.class.php index c732f17656..e0f8cace6c 100644 --- a/wcfsetup/install/files/lib/data/menu/item/MenuItemNode.class.php +++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemNode.class.php @@ -1,5 +1,6 @@ parentNode = $parentNode; - $this->menuItem = $menuItem; $this->depth = $depth; } @@ -80,15 +87,6 @@ class MenuItemNode implements \Countable, \RecursiveIterator { return $this->parentNode; } - /** - * Returns the menu item object of this node. - * - * @return MenuItem - */ - public function getMenuItem() { - return $this->menuItem; - } - /** * Returns the number of children. * diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php index 8a3209a5b5..cc1b679199 100644 --- a/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php +++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php @@ -102,7 +102,7 @@ class MenuItemNodeTree { for ($i = 0, $length = count($itemIDs); $i < $length; $i++) { /** @var MenuItemNode $node */ foreach ($nodeList as $node) { - if ($node->getMenuItem()->itemID == $itemIDs[$i]) { + if ($node->itemID == $itemIDs[$i]) { $node->setIsActive(); // only one effective item can be marked as active, use the first diff --git a/wcfsetup/install/files/lib/data/page/PageNode.class.php b/wcfsetup/install/files/lib/data/page/PageNode.class.php index 21ebd52bb1..1852df46f8 100644 --- a/wcfsetup/install/files/lib/data/page/PageNode.class.php +++ b/wcfsetup/install/files/lib/data/page/PageNode.class.php @@ -1,5 +1,6 @@ parentNode = $parentNode; - $this->page = $page; $this->depth = $depth; } @@ -74,15 +81,6 @@ class PageNode implements \Countable, \RecursiveIterator { return $this->parentNode; } - /** - * Returns the page object of this node - * - * @return Page - */ - public function getPage() { - return $this->page; - } - /** * Returns the number of children. * diff --git a/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php b/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php index 766e5b7cd4..e4830d9481 100644 --- a/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php +++ b/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php @@ -45,7 +45,7 @@ class MultiPageCondition extends AbstractMultiSelectCondition implements IConten $fieldElement = '"; -- 2.20.1