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

Merge branch 'master' into WebGUI8

Browse source
This commit is contained in:
Graham Knop 2010-04-13 07:50:02 -05:00
commit 2400f19099
797 changed files with 33894 additions and 27196 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/WebGUI/Asset/Sku/Product.pm
View file

@ -123,37 +123,37 @@ property warranty => (
);
property variantsJSON => (
##Collateral data is stored as JSON in here
noFormPost => 0,
noFormPost => 1,
default => '[]',
fieldType => "textarea",
);
property accessoryJSON => (
##Collateral data is stored as JSON in here
noFormPost => 0,
noFormPost => 1,
default => '[]',
fieldType => "textarea",
);
property relatedJSON => (
##Collateral data is stored as JSON in here
noFormPost => 0,
noFormPost => 1,
default => '[]',
fieldType => "textarea",
);
property specificationJSON => (
##Collateral data is stored as JSON in here
noFormPost => 0,
noFormPost => 1,
default => '[]',
fieldType => "textarea",
);
property featureJSON => (
##Collateral data is stored as JSON in here
noFormPost => 0,
noFormPost => 1,
default => '[]',
fieldType => "textarea",
);
property benefitJSON => (
##Collateral data is stored as JSON in here
noFormPost => 0,
noFormPost => 1,
default => '[]',
fieldType => "textarea",
);
@ -1655,8 +1655,9 @@ sub view {
my $error = shift;
my $session = $self->session;
my $cache = $session->cache;
my $cacheKey = $self->getWwwCacheKey( 'view' );
if (!$session->var->isAdminOn && $self->get("cacheTimeout") > 10){
my $out = $cache->get("view_".$self->getId);
my $out = $cache->get( $cacheKey );
return $out if $out;
}
my (%data, $segment, %var, @featureloop, @benefitloop, @specificationloop, @accessoryloop, @relatedloop);
@ -1859,7 +1860,7 @@ sub view {
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10 && $self->{_hasAddedToCart} != 1){
$cache->set("view_".$self->getId, $out, $self->cacheTimeout);
$cache->set( $cacheKey, $out, $self->cacheTimeout );
}
return $out;
}