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

trying to fix broken problem with new dynamic definitions

Browse source
This commit is contained in:
JT Smith 2005-07-21 02:17:20 +00:00
parent 1d7856eb92
commit 2999e6fdb8
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/upgrades/upgrade_6.6.4-6.7.0.pl
View file

@ -145,9 +145,7 @@ sub insertHelpTemplate{
</dl> </dl>
</tmpl_if> </tmpl_if>
EOT EOT
my $import=WebGUI::Asset->getImportNode; my $import=WebGUI::Asset->getImportNode;
my $folder = $import->addChild({ my $folder = $import->addChild({
title=>"6.7.0 Help System Template", title=>"6.7.0 Help System Template",
menuTitle=>"6.7.0 Help System Template", menuTitle=>"6.7.0 Help System Template",
@ -168,6 +166,7 @@ EOT
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sub insertSyndicatedContentTemplate{ sub insertSyndicatedContentTemplate{
print "\tInserting new syndicated content template\n" unless ($quiet);
my $template=q|<a name="<tmpl_var assetId>"></a> my $template=q|<a name="<tmpl_var assetId>"></a>
<tmpl_if session.var.adminOn> <tmpl_if session.var.adminOn>
@ -243,6 +242,7 @@ sub insertSyndicatedContentTemplate{
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sub insertXSLTSheets{ sub insertXSLTSheets{
print "\tInserting syndicated content XSLT\n" unless ($quiet);
my $import=WebGUI::Asset->getImportNode; my $import=WebGUI::Asset->getImportNode;
my $folder=$import->addChild( my $folder=$import->addChild(

12
lib/WebGUI/Asset.pm
View file

@ -391,6 +391,10 @@ An array reference containing additional information to include with the default
sub definition { sub definition {
my $class = shift; my $class = shift;
my $definition = shift || []; my $definition = shift || [];
my $name = WebGUI::International::get("asset","Asset");
if (scalar(@{$definition})) {
# $name = $definition->[0]{assetName};
};
push(@{$definition}, { push(@{$definition}, {
assetName=>WebGUI::International::get("asset","Asset"), assetName=>WebGUI::International::get("asset","Asset"),
tableName=>'assetData', tableName=>'assetData',
@ -399,7 +403,7 @@ sub definition {
properties=>{ properties=>{
title=>{ title=>{
fieldType=>'text', fieldType=>'text',
defaultValue=>$class->getName defaultValue=>$name
}, },
menuTitle=>{ menuTitle=>{
fieldType=>'text', fieldType=>'text',
@ -1177,7 +1181,7 @@ sub getIcon {
my $self = shift; my $self = shift;
my $small = shift; my $small = shift;
my $definition = $self->definition; my $definition = $self->definition;
my $icon = $definition->[0]{icon}; my $icon = $definition->[0]{icon} || "assets.gif";
return $session{config}{extrasURL}.'/adminConsole/small/'.$icon if ($small); return $session{config}{extrasURL}.'/adminConsole/small/'.$icon if ($small);
return $session{config}{extrasURL}.'/adminConsole/'.$icon; return $session{config}{extrasURL}.'/adminConsole/'.$icon;
} }
@ -1875,7 +1879,11 @@ sub new {
# got properties from cache # got properties from cache
} else { } else {
my $sql = "select * from asset"; my $sql = "select * from asset";
my @def = @{$class->definition};
WebGUI::ErrorHandler::debug(scalar(@def));
WebGUI::ErrorHandler::debug($className);
foreach my $definition (@{$class->definition}) { foreach my $definition (@{$class->definition}) {
WebGUI::ErrorHandler::warn($definition->{assetName});
$sql .= " left join ".$definition->{tableName}." on asset.assetId=" $sql .= " left join ".$definition->{tableName}." on asset.assetId="
.$definition->{tableName}.".assetId and ".$definition->{tableName}.".revisionDate=".$revisionDate; .$definition->{tableName}.".assetId and ".$definition->{tableName}.".revisionDate=".$revisionDate;
} }

2
lib/WebGUI/Asset/Wobject/WSClient.pm
View file

@ -60,6 +60,8 @@ sub _create_cache_key {
sub definition { sub definition {
my $class = shift; my $class = shift;
my $definition = shift; my $definition = shift;
my $httpHeaderFieldType;
if ($session{'config'}{'soapHttpHeaderOverride'}) {
$httpHeaderFieldType = 'text'; $httpHeaderFieldType = 'text';
} else { } else {
$httpHeaderFieldType = 'hidden'; $httpHeaderFieldType = 'hidden';