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

package importing fixes

Browse source
This commit is contained in:
Graham Knop 2008-02-08 00:00:13 +00:00
parent 93b5ca16e4
commit f22646625b
9 changed files with 36 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/WebGUI/Asset/File.pm
View file

@ -56,15 +56,13 @@ Override the default method in order to deal with attachments.
sub addRevision {
my $self = shift;
my $properties = shift;
if ($self->get("storageId") ne "") {
my $newSelf = $self->SUPER::addRevision(@_);
if ($self->getRevisionCount > 1 && $self->get("storageId")) {
my $newStorage = $self->getStorageClass->get($self->session,$self->get("storageId"))->copy;
$properties->{storageId} = $newStorage->getId;
$newSelf->update({storageId => $newStorage->getId});
}
my $newSelf = $self->SUPER::addRevision($properties, @_);
return $newSelf;
}

2
lib/WebGUI/Asset/Post.pm
View file

@ -64,7 +64,7 @@ Override the default method in order to deal with attachments.
sub addRevision {
my $self = shift;
my $newSelf = $self->SUPER::addRevision(@_);
if ($self->get("storageId")) {
if ($newSelf->getRevisionCount > 1 && $self->get("storageId")) {
my $newStorage = WebGUI::Storage->get($self->session,$self->get("storageId"))->copy;
$newSelf->update({storageId=>$newStorage->getId});
}

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

@ -72,7 +72,7 @@ Override the default method in order to deal with attachments.
sub addRevision {
my $self = shift;
my $newSelf = $self->SUPER::addRevision(@_);
if ($self->get("storageId")) {
if ($newSelf->getRevisionCount > 1 && $self->get("storageId")) {
my $newStorage = WebGUI::Storage->get($self->session,$self->get("storageId"))->copy;
$newSelf->update({storageId=>$newStorage->getId});
}

16
lib/WebGUI/Asset/Wobject/Product.pm
View file

@ -46,13 +46,15 @@ Override the default method in order to deal with attachments.
sub addRevision {
my $self = shift;
my $newSelf = $self->SUPER::addRevision(@_);
foreach my $field (qw(image1 image2 image3 brochure manual warranty)) {
if ($self->get($field)) {
my $newStorage = WebGUI::Storage->get($self->session,$self->get($field))->copy;
$newSelf->update({$field=>$newStorage->getId});
}
}
return $newSelf;
if ($newSelf->getRevisionCount > 1) {
foreach my $field (qw(image1 image2 image3 brochure manual warranty)) {
if ($self->get($field)) {
my $newStorage = WebGUI::Storage->get($self->session,$self->get($field))->copy;
$newSelf->update({$field=>$newStorage->getId});
}
}
}
return $newSelf;
}
#-------------------------------------------------------------------

41
lib/WebGUI/AssetPackage.pm
View file

@ -116,13 +116,9 @@ sub getPackageList {
=head2 importAssetData ( hashRef )
Imports the data exported by the exportAssetData method. If the asset
already exists, a new revision will be created with these properties. If it
doesn't exist then a child will be added to the current asset.
Imports the data exported by the exportAssetData method. If the asset already exists, a new revision will be created with these properties. If it doesn't exist then a child will be added to the current asset. Returns a reference to the created asset.
Returns a reference to the created asset.
=head3 assetData
=head3 hashRef
A hash reference containing the exported data.
@ -191,7 +187,7 @@ sub importAssetCollateralData {
#-------------------------------------------------------------------
=head2 importPackage ( storageLocation [, options] )
=head2 importPackage ( storageLocation )
Imports the data from a webgui package file.
@ -199,19 +195,11 @@ Imports the data from a webgui package file.
A reference to a WebGUI::Storage object that contains a webgui package file.
=head3 options
An optional hashref of options with the following possible keys:
skipAutoCommit : If true, will skip any automatic commit in
the site's settings.
=cut
sub importPackage {
my $self = shift;
my $storage = shift;
my $options = shift;
my $decompressed = $storage->untar($storage->getFiles->[0]);
my %assets = (); # All the assets we've imported
my $package = undef; # The asset package
@ -243,16 +231,6 @@ sub importPackage {
}
}
# Handle autocommit workflows
if (!$options->{skipAutoCommit} && $self->session->setting->get("autoRequestCommit")) {
if ($self->session->setting->get("skipCommitComments")) {
WebGUI::VersionTag->getWorking($self->session)->requestCommit;
}
else {
$self->session->http->setRedirect($self->getUrl("op=commitVersionTag;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
return undef;
}
}
return $package;
}
@ -329,7 +307,18 @@ sub www_importPackage {
my $i18n = WebGUI::International->new($self->session, "Asset");
return $self->session->style->userStyle($i18n->get("package corrupt"));
}
return $self->www_manageAssets();
# Handle autocommit workflows
if ($self->session->setting->get("autoRequestCommit")) {
if ($self->session->setting->get("skipCommitComments")) {
WebGUI::VersionTag->getWorking($self->session)->requestCommit;
}
else {
$self->session->http->setRedirect($self->getUrl("op=commitVersionTag;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
return undef;
}
}
return $self->www_manageAssets();
}
1;