Fix syntax errors, and remove duplicate code from the skeleton.

This commit is contained in:
Colin Kuskie 2010-03-08 16:35:46 -08:00
parent df31846aea
commit 2053d3ef08
3 changed files with 3 additions and 18 deletions

View file

@ -61,7 +61,7 @@ sub addPackage {
# Import the package into the import node
my $package = eval {
my $node = WebGUI::Asset->getImportNode($session);
my $node->importPackage( $storage, {
$node->importPackage( $storage, {
overwriteLatest => 1,
clearPackageFlag => 1,
setDefaultTemplate => 1,
@ -75,21 +75,6 @@ sub addPackage {
die "Error during package import on $file: $@\nStopping upgrade\n.";
}
# Turn off the package flag, and set the default flag for templates added
my $assetIds = $package->getLineage( ['self','descendants'] );
for my $assetId ( @{ $assetIds } ) {
my $asset = WebGUI::Asset->newByDynamicClass( $session, $assetId );
if ( !$asset ) {
print "Couldn't instantiate asset with ID '$assetId'. Please check package '$file' for corruption.\n";
next;
}
my $properties = { isPackage => 0 };
if ($asset->isa('WebGUI::Asset::Template')) {
$properties->{isDefault} = 1;
}
$asset->update( $properties );
}
return;
}

View file

@ -439,7 +439,7 @@ sub addPackage {
# Import the package into the import node
my $package = eval {
my $node = WebGUI::Asset->getImportNode($session);
my $node->importPackage( $storage, {
$node->importPackage( $storage, {
overwriteLatest => 1,
clearPackageFlag => 1,
setDefaultTemplate => 1,

View file

@ -173,7 +173,7 @@ sub addPackage {
# Import the package into the import node
my $package = eval {
my $node = WebGUI::Asset->getImportNode($session);
my $node->importPackage( $storage, {
$node->importPackage( $storage, {
overwriteLatest => 1,
clearPackageFlag => 1,
setDefaultTemplate => 1,