From 6a723e57675b85d297481f44d44bbc8314eb8df6 Mon Sep 17 00:00:00 2001 From: Drake Date: Fri, 20 Oct 2006 21:32:10 +0000 Subject: [PATCH] Merge fix from r3049 of 7.1 branch related to dashboard error pointed out by bug report "Macros failing due to Utility::isIn() bug". --- docs/changelog/7.x.x.txt | 4 ++-- lib/WebGUI/Asset/Wobject/Dashboard.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index c1746d30a..9f9037dbf 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -4,8 +4,8 @@ 7.1.2 - Fixed a bug that caused workflows to fail if collaboration systems and - posts for that CS were in the same version tag at commit time. - + posts for that CS were in the same version tag at commit time. + - fix: minor assetsToHide implementation bug in dashboard 7.1.1 - fix: some issues with asset exports not handling URLs with dots correctly diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm index a23400012..3d6e01e11 100644 --- a/lib/WebGUI/Asset/Wobject/Dashboard.pm +++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm @@ -164,7 +164,7 @@ sub prepareView { my $children = $self->getLineage( ["children"], { returnObjects=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout","WebGUI::Asset::Wobject::Dashboard"] }); my @hidden = split("\n",$self->get("assetsToHide")); foreach my $child (@{$children}) { - unless (isIn($child,@hidden) || !($child->canView)) { + unless (isIn($child->getId, @hidden) || !($child->canView)) { $self->session->style->setRawHeadTags($child->getExtraHeadTags); $child->prepareView; }