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

bug fixes

Browse source
This commit is contained in:
JT Smith 2009-10-22 10:11:12 -05:00
parent 7f474ed7bc
commit 78024c9907
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/WebGUI/Asset.pm
View file

@ -84,10 +84,11 @@ use WebGUI::Definition::Asset (
defaultValue =>0,
},
encryptPage=>{
fieldType =>
fieldType => 'yesNo',
noFormPost =>
sub {
my $self = shift;
return $self->session->config->get("sslEnabled") ? 'yesNo' : 'hidden';
return $self->session->config->get("sslEnabled");
},
tab => "security",
label => ['encrypt page','Asset'],
@ -907,13 +908,9 @@ sub getEditForm {
$params{value} = [$params{value}];
}
if (exists $fieldHash{visible} and not $fieldHash{visible}) {
$params{fieldType} = 'hidden';
}
else {
%params = (%params, %fieldHash);
delete $params{tab};
}
%params = (%params, %fieldHash);
delete $params{tab};
delete $params{tableName};
# if there isnt a tab specified lets define one
my $tab = $fieldHash{tab} || "properties";
@ -1585,10 +1582,11 @@ sub new {
}
my $properties = eval{$session->cache->get(["asset",$assetId,$revisionDate])};
unless (exists $properties->{assetId}) {
unless (exists $properties->{assetId}) { # can we get it from cache?
my $sql = "select * from asset";
my $where = " where asset.assetId=?";
my $placeHolders = [$assetId];
foreach my $definition (@{$class->definition($session)}) {
$sql .= ",".$definition->{tableName};
$where .= " and (asset.assetId=".$definition->{tableName}.".assetId and ".$definition->{tableName}.".revisionDate=".$revisionDate.")";