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

fix: Order of content position loops in Page Layout

Browse source
This commit is contained in:
Yung Han Khoe 2007-06-06 15:28:07 +00:00
parent 097d71cd65
commit 17b86ba9c7
2 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/7.x.x.txt
View file

@ -23,6 +23,8 @@
- Added import/export mechanism for EMS events. - Added import/export mechanism for EMS events.
- Removed the long depricated Memcached cache module. - Removed the long depricated Memcached cache module.
- fix: Show edit links on EMS search view without being in Admin group - fix: Show edit links on EMS search view without being in Admin group
- fix: Order of content position loops in Page Layout (Yung Han Khoe, United Knowledge)
http://www.plainblack.com/bugs/tracker/7.4-order-of-content-position-loops-in-page-layout
7.3.19 7.3.19

39
lib/WebGUI/Asset/Wobject/Layout.pm
View file

@ -153,8 +153,7 @@ sub prepareView {
# I'm sure there's a more efficient way to do this. We'll figure it out someday. # I'm sure there's a more efficient way to do this. We'll figure it out someday.
my @positions = split(/\./,$self->get("contentPositions")); my @positions = split(/\./,$self->get("contentPositions"));
my @hidden = split("\n",$self->get("assetsToHide")); my @hidden = split("\n",$self->get("assetsToHide"));
my @placeHolder1 = (); my %placeHolder;
my @placeHolderN = ();
my $i = 1; my $i = 1;
my $template = WebGUI::Asset->new($self->session,$self->get("templateId"),"WebGUI::Asset::Template"); my $template = WebGUI::Asset->new($self->session,$self->get("templateId"),"WebGUI::Asset::Template");
my $templateContent = $template->get("template"); my $templateContent = $template->get("template");
@ -166,26 +165,30 @@ sub prepareView {
my @found; my @found;
foreach my $position (@positions) { foreach my $position (@positions) {
my @assets = split(",",$position); my @assets = split(",",$position);
foreach my $asset (@assets) { ASSET: foreach my $asset (@assets) {
foreach my $child (@{$children}) { my $childCount = 0;
CHILD: foreach my $child (@{$children}) {
if ($asset eq $child->getId) { if ($asset eq $child->getId) {
unless (isIn($asset,@hidden) || !($child->canView)) { unless (isIn($asset,@hidden) || !($child->canView)) {
$child->prepareView; $child->prepareView;
if ($i > $numPositions || $i==1) { if ($i > $numPositions || $i==1) {
push(@placeHolder1, $child); $placeHolder{$child->getId} = $child;
push(@{$vars{"position1_loop"}},{ push(@{$vars{"position1_loop"}},{
id=>$child->getId, id=>$child->getId,
content=>"~~~" content=>"~~~".$child->getId."~~~~~"
}); });
} else { } else {
push(@placeHolderN, $child); $placeHolder{$child->getId} = $child;
push(@{$vars{"position".$i."_loop"}},{ push(@{$vars{"position".$i."_loop"}},{
id=>$child->getId, id=>$child->getId,
content=>"~~~" content=>"~~~".$child->getId."~~~~~"
}); });
} }
} }
push(@found, $child->getId); splice(@{$children},$childCount,1);
next ASSET;
}else{
$childCount++;
} }
} }
} }
@ -193,19 +196,19 @@ sub prepareView {
} }
# deal with unplaced children # deal with unplaced children
foreach my $child (@{$children}) { foreach my $child (@{$children}) {
unless (isIn($child->getId, @found)||isIn($child->getId,@hidden)) { unless (isIn($child->getId,@hidden)) {
if ($child->canView) { if ($child->canView) {
$self->session->style->setRawHeadTags($child->getExtraHeadTags); $self->session->style->setRawHeadTags($child->getExtraHeadTags);
$child->prepareView; $child->prepareView;
push(@placeHolder1, $child); $placeHolder{$child->getId} = $child;
push(@{$vars{"position1_loop"}},{ push(@{$vars{"position1_loop"}},{
id=>$child->getId, id=>$child->getId,
content=>"~~~" content=>"~~~".$child->getId."~~~~~"
}); });
} }
} }
} }
@{$self->{_viewPlaceholders}} = (@placeHolder1, @placeHolderN); $self->{_viewPlaceholder} = \%placeHolder;
$vars{showAdmin} = ($self->session->var->isAdminOn && $self->canEdit); $vars{showAdmin} = ($self->session->var->isAdminOn && $self->canEdit);
$self->{_viewVars} = \%vars; $self->{_viewVars} = \%vars;
if ($vars{showAdmin}) { if ($vars{showAdmin}) {
@ -238,15 +241,17 @@ sub view {
'; ';
} }
my $showPerformance = $self->session->errorHandler->canShowPerformanceIndicators(); my $showPerformance = $self->session->errorHandler->canShowPerformanceIndicators();
my @parts = split("~~~",$self->processTemplate($self->{_viewVars},undef,$self->{_viewTemplate})); my $out = $self->processTemplate($self->{_viewVars},undef,$self->{_viewTemplate});
my @parts = split("~~~~~",$self->processTemplate($self->{_viewVars},undef,$self->{_viewTemplate}));
my $output = ""; my $output = "";
foreach my $part (@parts) { foreach my $part (@parts) {
my ($outputPart, $assetId) = split("~~~",$part,2);
if ($self->{_viewPrintOverride}) { if ($self->{_viewPrintOverride}) {
$self->session->output->print($part); $self->session->output->print($outputPart);
} else { } else {
$output .= $part; $output .= $outputPart;
} }
my $asset = shift @{$self->{_viewPlaceholders}}; my $asset = $self->{_viewPlaceholder}{$assetId};
if (defined $asset) { if (defined $asset) {
my $t = [Time::HiRes::gettimeofday()] if ($showPerformance); my $t = [Time::HiRes::gettimeofday()] if ($showPerformance);
my $assetOutput = $asset->view; my $assetOutput = $asset->view;