began adding streaming support for view method
This commit is contained in:
JT Smith
parent
80fc76691f
commit
46fa7e78e7
15 changed files with 240 additions and 188 deletions
|
|
@ -118,6 +118,27 @@ sub definition {
|
|||
return $class->SUPER::definition($session, $definition);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 prepareView ( )
|
||||
|
||||
See WebGUI::Asset::prepareView() for details.
|
||||
|
||||
=cut
|
||||
|
||||
sub prepareView {
|
||||
my $self = shift;
|
||||
$self->SUPER::prepareView();
|
||||
my $templateId = $self->get("templateId");
|
||||
if ($self->session->form->process("overrideTemplateId") ne "") {
|
||||
$templateId = $self->session->form->process("overrideTemplateId");
|
||||
}
|
||||
my $template = WebGUI::Asset::Template->new($self->session, $templateId);
|
||||
$template->prepare;
|
||||
$self->{_viewTemplate} = $template;
|
||||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 view ( )
|
||||
|
|
@ -181,11 +202,7 @@ sub view {
|
|||
$var{description} = $p->getPage;
|
||||
}
|
||||
$p->appendTemplateVars(\%var);
|
||||
my $templateId = $self->get("templateId");
|
||||
if ($self->session->form->process("overrideTemplateId") ne "") {
|
||||
$templateId = $self->session->form->process("overrideTemplateId");
|
||||
}
|
||||
return $self->processTemplate(\%var, $templateId);
|
||||
return $self->processTemplate(\%var, undef, $self->{_viewTemplate});
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -782,6 +782,23 @@ sub isSubscribed {
|
|||
return $self->session->user->isInGroup($self->get("subscriptionGroupId"));
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 prepareView ( )
|
||||
|
||||
See WebGUI::Asset::prepareView() for details.
|
||||
|
||||
=cut
|
||||
|
||||
sub prepareView {
|
||||
my $self = shift;
|
||||
$self->SUPER::prepareView();
|
||||
my $template = WebGUI::Asset::Template->new($self->session, $self->get("collaborationTemplateId"));
|
||||
$template->prepare;
|
||||
$self->{_viewTemplate} = $template;
|
||||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub processPropertiesFromFormPost {
|
||||
my $self = shift;
|
||||
|
|
@ -937,7 +954,7 @@ sub view {
|
|||
my $p = WebGUI::Paginator->new($self->session,$self->getUrl,$self->get("threadsPerPage"));
|
||||
$self->appendPostListTemplateVars(\%var, $sql, $p);
|
||||
$self->appendTemplateLabels(\%var);
|
||||
return $self->processTemplate(\%var,$self->get("collaborationTemplateId"));
|
||||
return $self->processTemplate(\%var,undef, $self->{_viewTemplate});
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -139,107 +139,6 @@ sub getEditForm {
|
|||
sub prepareView {
|
||||
my $self = shift;
|
||||
$self->SUPER::prepareView;
|
||||
if ($self->session->var->isAdminOn) {
|
||||
# under normal circumstances we don't put HTML stuff in our code, but this will make it much easier
|
||||
# for end users to work with our templates
|
||||
$self->session->style->setScript($self->session->config->get("extrasURL")."/draggable.js",{ type=>"text/javascript" });
|
||||
$self->session->style->setLink($self->session->config->get("extrasURL")."/draggable.css",{ type=>"text/css", rel=>"stylesheet", media=>"all" });
|
||||
$self->session->style->setRawHeadTags('
|
||||
<style type="text/css">
|
||||
.dragging, .empty {
|
||||
background-image: url("'.$self->session->config->get("extrasURL").'/opaque.gif");
|
||||
}
|
||||
</style>
|
||||
');
|
||||
}
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub viewOriginal {
|
||||
my $self = shift;
|
||||
my $children = $self->getLineage( ["children"], { returnObjects=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout"] });
|
||||
my %vars;
|
||||
# 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 @hidden = split("\n",$self->get("assetsToHide"));
|
||||
my $i = 1;
|
||||
my $template= WebGUI::Asset->newByDynamicClass($self->session,$self->get("templateId"))->get("template");
|
||||
my $numPositions = 1;
|
||||
foreach my $j (2..15) {
|
||||
$numPositions = $j if $template =~ m/position${j}\_loop/;
|
||||
}
|
||||
my @found;
|
||||
my $showPerformance = $self->session->errorHandler->canShowPerformanceIndicators();
|
||||
foreach my $position (@positions) {
|
||||
my @assets = split(",",$position);
|
||||
foreach my $asset (@assets) {
|
||||
foreach my $child (@{$children}) {
|
||||
if ($asset eq $child->getId) {
|
||||
unless (isIn($asset,@hidden) || !($child->canView)) {
|
||||
$self->session->style->setRawHeadTags($child->getExtraHeadTags);
|
||||
my $t = [Time::HiRes::gettimeofday()] if ($showPerformance);
|
||||
my $view = $child->view;
|
||||
$view .= "Asset:".Time::HiRes::tv_interval($t) if ($showPerformance);
|
||||
if ($i > $numPositions) {
|
||||
push(@{$vars{"position1_loop"}},{
|
||||
id=>$child->getId,
|
||||
content=>$view
|
||||
});
|
||||
} else {
|
||||
push(@{$vars{"position".$i."_loop"}},{
|
||||
id=>$child->getId,
|
||||
content=>$view
|
||||
});
|
||||
}
|
||||
}
|
||||
push(@found, $child->getId);
|
||||
}
|
||||
}
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
# deal with unplaced children
|
||||
foreach my $child (@{$children}) {
|
||||
unless (isIn($child->getId, @found)||isIn($child->getId,@hidden)) {
|
||||
if ($child->canView) {
|
||||
my $t = [Time::HiRes::gettimeofday()] if ($showPerformance);
|
||||
my $view = $child->view;
|
||||
$view .= "Asset:".Time::HiRes::tv_interval($t) if ($showPerformance);
|
||||
push(@{$vars{"position1_loop"}},{
|
||||
id=>$child->getId,
|
||||
content=>$view
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
$vars{showAdmin} = ($self->session->var->get("adminOn") && $self->canEdit);
|
||||
if ($vars{showAdmin}) {
|
||||
# under normal circumstances we don't put HTML stuff in our code, but this will make it much easier
|
||||
# for end users to work with our templates
|
||||
$self->session->style->setScript($self->session->config->get("extrasURL")."/draggable.js",{ type=>"text/javascript" });
|
||||
$self->session->style->setLink($self->session->config->get("extrasURL")."/draggable.css",{ type=>"text/css", rel=>"stylesheet", media=>"all" });
|
||||
$self->session->style->setRawHeadTags('
|
||||
<style type="text/css">
|
||||
.dragging, .empty {
|
||||
background-image: url("'.$self->session->config->get("extrasURL").'/opaque.gif");
|
||||
}
|
||||
</style>
|
||||
');
|
||||
$vars{"dragger.icon"} = $self->session->icon->drag();
|
||||
$vars{"dragger.init"} = '
|
||||
<iframe id="dragSubmitter" style="display: none;" src="'.$self->session->config->get("extrasURL").'/spacer.gif"></iframe>
|
||||
<script type="text/javascript">
|
||||
dragable_init("'.$self->getUrl("func=setContentPositions;map=").'");
|
||||
</script>
|
||||
';
|
||||
}
|
||||
|
||||
return $self->processTemplate(\%vars,$self->get("templateId"));
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub view {
|
||||
my $self = shift;
|
||||
my $children = $self->getLineage( ["children"], { returnObjects=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout"] });
|
||||
my %vars;
|
||||
# I'm sure there's a more efficient way to do this. We'll figure it out someday.
|
||||
|
|
@ -247,13 +146,14 @@ sub view {
|
|||
my @hidden = split("\n",$self->get("assetsToHide"));
|
||||
my @placeHolder = ();
|
||||
my $i = 1;
|
||||
my $template= WebGUI::Asset->newByDynamicClass($self->session,$self->get("templateId"))->get("template");
|
||||
my $template = WebGUI::Asset->new($self->session,$self->get("templateId"),"WebGUI::Asset::Template");
|
||||
my $templateContent = $template->get("template");
|
||||
$self->{_viewTemplate} = $template;
|
||||
my $numPositions = 1;
|
||||
foreach my $j (2..15) {
|
||||
$numPositions = $j if $template =~ m/position${j}\_loop/;
|
||||
$numPositions = $j if $templateContent =~ m/position${j}\_loop/;
|
||||
}
|
||||
my @found;
|
||||
my $showPerformance = $self->session->errorHandler->canShowPerformanceIndicators();
|
||||
foreach my $position (@positions) {
|
||||
my @assets = split(",",$position);
|
||||
foreach my $asset (@assets) {
|
||||
|
|
@ -261,6 +161,7 @@ sub view {
|
|||
if ($asset eq $child->getId) {
|
||||
unless (isIn($asset,@hidden) || !($child->canView)) {
|
||||
$self->session->style->setRawHeadTags($child->getExtraHeadTags);
|
||||
$child->prepareView;
|
||||
push(@placeHolder, $child);
|
||||
if ($i > $numPositions) {
|
||||
push(@{$vars{"position1_loop"}},{
|
||||
|
|
@ -284,6 +185,7 @@ sub view {
|
|||
foreach my $child (@{$children}) {
|
||||
unless (isIn($child->getId, @found)||isIn($child->getId,@hidden)) {
|
||||
if ($child->canView) {
|
||||
$child->prepareView;
|
||||
push(@placeHolder, $child);
|
||||
push(@{$vars{"position1_loop"}},{
|
||||
id=>$child->getId,
|
||||
|
|
@ -292,22 +194,44 @@ sub view {
|
|||
}
|
||||
}
|
||||
}
|
||||
$vars{showAdmin} = ($self->session->var->get("adminOn") && $self->canEdit);
|
||||
$self->{_viewPlaceholders} = \@placeHolder;
|
||||
$vars{showAdmin} = ($self->session->var->isAdminOn && $self->canEdit);
|
||||
$self->{_viewVars} = \%vars;
|
||||
if ($vars{showAdmin}) {
|
||||
# under normal circumstances we don't put HTML stuff in our code, but this will make it much easier
|
||||
# for end users to work with our templates
|
||||
$vars{"dragger.icon"} = $self->session->icon->drag();
|
||||
$vars{"dragger.init"} = '
|
||||
$self->session->style->setScript($self->session->config->get("extrasURL")."/draggable.js",{ type=>"text/javascript" });
|
||||
$self->session->style->setLink($self->session->config->get("extrasURL")."/draggable.css",{ type=>"text/css", rel=>"stylesheet", media=>"all" });
|
||||
$self->session->style->setRawHeadTags('
|
||||
<style type="text/css">
|
||||
.dragging, .empty {
|
||||
background-image: url("'.$self->session->config->get("extrasURL").'/opaque.gif");
|
||||
}
|
||||
</style>
|
||||
');
|
||||
}
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub view {
|
||||
my $self = shift;
|
||||
if ($self->{_viewVars}{showAdmin}) {
|
||||
# under normal circumstances we don't put HTML stuff in our code, but this will make it much easier
|
||||
# for end users to work with our templates
|
||||
$self->{_viewVars}{"dragger.icon"} = $self->session->icon->drag();
|
||||
$self->{_viewVars}{"dragger.init"} = '
|
||||
<iframe id="dragSubmitter" style="display: none;" src="'.$self->session->config->get("extrasURL").'/spacer.gif"></iframe>
|
||||
<script type="text/javascript">
|
||||
dragable_init("'.$self->getUrl("func=setContentPositions;map=").'");
|
||||
</script>
|
||||
';
|
||||
}
|
||||
my @parts = split("~~~",$self->processTemplate(\%vars,$self->get("templateId")));
|
||||
my $showPerformance = $self->session->errorHandler->canShowPerformanceIndicators();
|
||||
my $out = $self->processTemplate($self->{_viewVars},undef,$self->{_viewTemplate});
|
||||
my @parts = split("~~~",$self->processTemplate($self->{_viewVars},undef,$self->{_viewTemplate}));
|
||||
foreach my $part (@parts) {
|
||||
$self->session->output->print($part);
|
||||
my $asset = shift @placeHolder;
|
||||
my $asset = shift @{$self->{_viewPlaceholders}};
|
||||
if (defined $asset) {
|
||||
my $t = [Time::HiRes::gettimeofday()] if ($showPerformance);
|
||||
$self->session->output->print($asset->view);
|
||||
|
|
@ -325,16 +249,5 @@ sub www_setContentPositions {
|
|||
return "Map set: ".$self->session->form->process("map");
|
||||
}
|
||||
|
||||
sub www_view {
|
||||
my $self = shift;
|
||||
$self->session->http->getHeader;
|
||||
$self->prepareView;
|
||||
my $style = $self->processStyle("~~~");
|
||||
my ($head, $foot) = split("~~~",$style);
|
||||
$self->session->output->print($head);
|
||||
$self->view;
|
||||
$self->session->output->print($foot);
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue