Merge fix from r3049 of 7.1 branch related to dashboard error pointed out
by bug report "Macros failing due to Utility::isIn() bug".
This commit is contained in:
parent
6ad527c4a9
commit
6a723e5767
2 changed files with 3 additions and 3 deletions
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
7.1.2
|
7.1.2
|
||||||
- Fixed a bug that caused workflows to fail if collaboration systems and
|
- 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
|
7.1.1
|
||||||
- fix: some issues with asset exports not handling URLs with dots correctly
|
- fix: some issues with asset exports not handling URLs with dots correctly
|
||||||
|
|
|
||||||
|
|
@ -164,7 +164,7 @@ sub prepareView {
|
||||||
my $children = $self->getLineage( ["children"], { returnObjects=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout","WebGUI::Asset::Wobject::Dashboard"] });
|
my $children = $self->getLineage( ["children"], { returnObjects=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout","WebGUI::Asset::Wobject::Dashboard"] });
|
||||||
my @hidden = split("\n",$self->get("assetsToHide"));
|
my @hidden = split("\n",$self->get("assetsToHide"));
|
||||||
foreach my $child (@{$children}) {
|
foreach my $child (@{$children}) {
|
||||||
unless (isIn($child,@hidden) || !($child->canView)) {
|
unless (isIn($child->getId, @hidden) || !($child->canView)) {
|
||||||
$self->session->style->setRawHeadTags($child->getExtraHeadTags);
|
$self->session->style->setRawHeadTags($child->getExtraHeadTags);
|
||||||
$child->prepareView;
|
$child->prepareView;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue