diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 20dd1164f..04ada563a 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -391,10 +391,6 @@ 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',
@@ -403,7 +399,7 @@ sub definition {
properties=>{
title=>{
fieldType=>'text',
- defaultValue=>$name
+ defaultValue=>undef
},
menuTitle=>{
fieldType=>'text',
@@ -1879,11 +1875,7 @@ 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/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 3be3ff038..f86f6aad5 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -294,8 +294,6 @@ sub getToolbar {
sub view {
my $self = shift;
# we've got to determine what our start point is based upon user conditions
-use Time::HiRes;
-my $t = [Time::HiRes::gettimeofday()];
my $start;
$session{asset} = WebGUI::Asset->newByUrl unless (exists $session{asset});
my $current = $session{asset};
@@ -326,8 +324,6 @@ my $t = [Time::HiRes::gettimeofday()];
$rules{assetToPedigree} = $current if (isIn("pedigree",@includedRelationships));
$rules{ancestorLimit} = $self->get("ancestorEndPoint");
my $assets = $start->getLineage(\@includedRelationships,\%rules);
-my $timeoutput = "get records: ".Time::HiRes::tv_interval($t)."
";
-my $t = [Time::HiRes::gettimeofday()];
my $var = {'page_loop' => []};
my @interestingProperties = ('assetId', 'parentId', 'ownerUserId', 'synopsis', 'newWindow');
foreach my $property (@interestingProperties) {
@@ -432,12 +428,7 @@ my $t = [Time::HiRes::gettimeofday()];
}
push(@{$var->{page_loop}}, $pageData);
}
-$timeoutput .= "build vars: ".Time::HiRes::tv_interval($t)."
";
-my $t = [Time::HiRes::gettimeofday()];
- my $output = $self->processTemplate($var,$self->get("templateId"));
-$timeoutput .= "process template: ".Time::HiRes::tv_interval($t)."
";
- return $output."
".$timeoutput;
-
+ return $self->processTemplate($var,$self->get("templateId"));
}