oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Problems with page.isSibling and page.inBranch

Browse source
This commit is contained in:
JT Smith 2006-06-21 16:47:33 +00:00
parent 8ac6f3a29c
commit bc6028dead
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/6.x.x.txt
View file

@ -7,6 +7,7 @@
- fix: Survey - editQuestionSave - yesNo fields always "yes" (Matthew Wilson) - fix: Survey - editQuestionSave - yesNo fields always "yes" (Matthew Wilson)
- Fixed a memory leak in Spectre that could cause it to double in size - Fixed a memory leak in Spectre that could cause it to double in size
roughly every 30 hours under certain conditions. roughly every 30 hours under certain conditions.
- fix: Problems with page.isSibling and page.inBranch
6.99.4 6.99.4

7
lib/WebGUI/Asset/Wobject/Navigation.pm
View file

@ -412,11 +412,10 @@ sub view {
$pageData->{"page.isDescendant"} = ( $pageLineage =~ m/^$currentLineage/ && !$pageData->{"page.isCurrent"}); $pageData->{"page.isDescendant"} = ( $pageLineage =~ m/^$currentLineage/ && !$pageData->{"page.isCurrent"});
$pageData->{"page.isAncestor"} = ( $currentLineage =~ m/^$pageLineage/ && !$pageData->{"page.isCurrent"}); $pageData->{"page.isAncestor"} = ( $currentLineage =~ m/^$pageLineage/ && !$pageData->{"page.isCurrent"});
my $currentBranchLineage = substr($currentLineage,0,12); my $currentBranchLineage = substr($currentLineage,0,12);
$pageData->{"page.inBranchRoot"} = ($currentBranchLineage =~ m/^$pageLineage/); $pageData->{"page.inBranchRoot"} = ($pageLineage =~ m/^$currentBranchLineage/);
$pageData->{"page.isSibling"} = ( $pageData->{"page.isSibling"} = (
$pageData->{"page.inBranchRoot"} && $asset->get("parentId") eq $current->get("parentId") &&
$asset->getLineageLength == $current->getLineageLength && $asset->getId ne $current->getId
!$pageData->{"page.isCurrent"}
); );
$pageData->{"page.inBranch"} = ( $pageData->{"page.inBranch"} = (
$pageData->{"page.isCurrent"} || $pageData->{"page.isCurrent"} ||