Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request zendframework/zendframework#5803 from riceri/master
Hide sub menus if all pages in the sub menu is hidden.
  • Loading branch information
weierophinney committed Mar 5, 2014
177 parents 0926ab5 + 695649c + 5e5614b + 82cdcc8 + 4583c52 + 27420a4 + 2e7e46b + f51e1ec + e6b286e + d5c10b6 + 0eabc04 + fed2583 + af2d845 + e8e4ce2 + f4be937 + 9323faa + 65deb5a + d5a4f17 + 94b36e8 + 62824a2 + 6378cbe + a10281c + cd0ff39 + 02e8122 + a667dd4 + 02ccc35 + 7d61487 + ab2f663 + a27ca10 + 75af0e5 + 24f498b + d2dd157 + 6c759d8 + 51b0320 + aabe1c0 + e76b67c + 5d85a78 + d285b08 + c5df6b0 + ff58ff4 + 5675884 + a55ead5 + 47eb5a8 + a36e34a + 3e520ad + 7b0d374 + 461c28b + 3890e69 + 316384e + 1431343 + debad5a + 1680741 + 4497a00 + bb6633a + 6b7ed03 + 35fcae3 + 0737e9d + c31bf4c + 918649e + ecbe771 + b4124fc + f4e1da0 + a8c70a8 + 50d3c5d + 79180fa + f6f9386 + 8ed6590 + d79a4a4 + 3958052 + eae6146 + 1cc7a46 + 1d9542f + a22d6e2 + 3496b67 + 9398e77 + 687d980 + 900dc7d + 21f6363 + 0eeb6ff + 8c442a3 + adf1f8e + c2ceb18 + 9b17a1c + d5dab4a + 346a62a + 9808633 + bdeec54 + 1a2506a + f5f3d02 + b623064 + 4338bf4 + bdababf + 4054000 + 4449c16 + d3d8b33 + 8427cf8 + 8d162ec + a988e9a + 3e9d597 + ee93c08 + 9d3ce53 + f04a59c + 0c3f2de + a654383 + 502d937 + 93350ca + 23a0ccc + 15dc071 + 6ca79e9 + 7645850 + 7b0843e + b9f38cc + 53d4205 + 0ba91ba + 7ad75c4 + 35376fd + e6713be + b15c871 + 4121ed2 + 905626d + 529973a + e28e80a + b64275a + 2f43075 + 05dea5f + b0f56ea + a0ae2ac + 8b01bd8 + fc7acfc + 87b1ffc + c00475b + 6d05c34 + 2f2787b + 229c668 + c164e00 + e5c1ff6 + 5023ed3 + 3c689b8 + 789b92c + ae927c2 + 7741eac + ab3bdcd + 6c02989 + 0d17da2 + 1035d13 + 361c1cf + b31816b + 0102405 + 84330e4 + 50b28a7 + 196892e + 55ecf0a + cdf2159 + 97a5f0f + 2951d73 + bbfc15c + 7aff06a + 2ec87c8 + 9fd7105 + 090f966 + 295dff4 + d43b026 + 827fd02 + 5559cd9 + cfb3de6 + 66a84a1 + e0b4e9c + 52480f3 + 0ea293c + 70909e2 + dd77695 + e75fb63 + 14e8709 + dd7e650 + de66f61 + 1b59304 + 50ac9f4 commit 334847d
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
12 changes: 11 additions & 1 deletion src/AbstractContainer.php
Expand Up @@ -258,10 +258,20 @@ public function hasPage(Page\AbstractPage $page, $recursive = false)
/**
* Returns true if container contains any pages
*
* @param bool $onlyVisible whether to check only visible pages
* @return bool whether container has any pages
*/
public function hasPages()
public function hasPages($onlyVisible = false)
{
if ($onlyVisible) {
foreach ($this->pages as $page) {
if ($page->isVisible()) {
return true;
}
}
// no visible pages found
return false;
}
return count($this->index) > 0;
}

Expand Down
20 changes: 18 additions & 2 deletions test/ContainerTest.php
Expand Up @@ -682,19 +682,35 @@ public function testHasPages()
{
$nav1 = new Navigation\Navigation();
$nav2 = new Navigation\Navigation();
$nav3 = new Navigation\Navigation();
$nav4 = new Navigation\Navigation();
$nav2->addPage(array(
'label' => 'Page 1',
'uri' => '#'
));
$nav3->addPage(array(
'label' => 'Page 1',
'uri' => '#',
'visible' => true
));
$nav4->addPage(array(
'label' => 'Page 1',
'uri' => '#',
'visible' => false
));

$expected = array(
'empty' => false,
'notempty' => true
'notempty' => true,
'visible' => true,
'notvisible' => false
);

$actual = array(
'empty' => $nav1->hasPages(),
'notempty' => $nav2->hasPages()
'notempty' => $nav2->hasPages(),
'visible' => $nav3->hasPages(false),
'notvisible' => $nav4->hasPages(true)
);

$this->assertEquals($expected, $actual);
Expand Down

0 comments on commit 334847d

Please sign in to comment.