diff --git a/docs/upgrades/upgrade_6.6.4-6.7.0.pl b/docs/upgrades/upgrade_6.6.4-6.7.0.pl
index 5a6f03440..03be04476 100644
--- a/docs/upgrades/upgrade_6.6.4-6.7.0.pl
+++ b/docs/upgrades/upgrade_6.6.4-6.7.0.pl
@@ -145,9 +145,7 @@ sub insertHelpTemplate{
EOT
-
my $import=WebGUI::Asset->getImportNode;
-
my $folder = $import->addChild({
title=>"6.7.0 Help System Template",
menuTitle=>"6.7.0 Help System Template",
@@ -168,6 +166,7 @@ EOT
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sub insertSyndicatedContentTemplate{
+ print "\tInserting new syndicated content template\n" unless ($quiet);
my $template=q|
@@ -243,6 +242,7 @@ sub insertSyndicatedContentTemplate{
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sub insertXSLTSheets{
+ print "\tInserting syndicated content XSLT\n" unless ($quiet);
my $import=WebGUI::Asset->getImportNode;
my $folder=$import->addChild(
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 758b7a7e8..8783727fa 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -391,6 +391,10 @@ An array reference containing additional information to include with the default
sub definition {
my $class = shift;
my $definition = shift || [];
+ my $name = WebGUI::International::get("asset","Asset");
+ if (scalar(@{$definition})) {
+# $name = $definition->[0]{assetName};
+ };
push(@{$definition}, {
assetName=>WebGUI::International::get("asset","Asset"),
tableName=>'assetData',
@@ -399,7 +403,7 @@ sub definition {
properties=>{
title=>{
fieldType=>'text',
- defaultValue=>$class->getName
+ defaultValue=>$name
},
menuTitle=>{
fieldType=>'text',
@@ -1177,7 +1181,7 @@ sub getIcon {
my $self = shift;
my $small = shift;
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/'.$icon;
}
@@ -1875,7 +1879,11 @@ sub new {
# got properties from cache
} else {
my $sql = "select * from asset";
+my @def = @{$class->definition};
+WebGUI::ErrorHandler::debug(scalar(@def));
+WebGUI::ErrorHandler::debug($className);
foreach my $definition (@{$class->definition}) {
+WebGUI::ErrorHandler::warn($definition->{assetName});
$sql .= " left join ".$definition->{tableName}." on asset.assetId="
.$definition->{tableName}.".assetId and ".$definition->{tableName}.".revisionDate=".$revisionDate;
}
diff --git a/lib/WebGUI/Asset/Wobject/WSClient.pm b/lib/WebGUI/Asset/Wobject/WSClient.pm
index 2ed80dee4..d2007138c 100644
--- a/lib/WebGUI/Asset/Wobject/WSClient.pm
+++ b/lib/WebGUI/Asset/Wobject/WSClient.pm
@@ -60,6 +60,8 @@ sub _create_cache_key {
sub definition {
my $class = shift;
my $definition = shift;
+my $httpHeaderFieldType;
+ if ($session{'config'}{'soapHttpHeaderOverride'}) {
$httpHeaderFieldType = 'text';
} else {
$httpHeaderFieldType = 'hidden';