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

fixed: storage locations for some assets in packages not imported correctly

Browse source
This commit is contained in:
Graham Knop 2008-06-20 08:57:20 +00:00
parent 97b773e8c5
commit 8f9568c887
5 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ sub addRevision {
my $self = shift;
my $newSelf = $self->SUPER::addRevision(@_);
if ($self->getRevisionCount > 1 && $self->get("storageId")) {
if ($newSelf->get("storageId") && $newSelf->get("storageId") eq $self->get('storageId')) {
my $newStorage = $self->getStorageClass->get($self->session,$self->get("storageId"))->copy;
$newSelf->update({storageId => $newStorage->getId});
}

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 ($newSelf->getRevisionCount > 1 && $self->get("storageId")) {
if ($newSelf->get("storageId") && $newSelf->get("storageId") eq $self->get('storageId')) {
my $newStorage = WebGUI::Storage->get($self->session,$self->get("storageId"))->copy;
$newSelf->update({storageId=>$newStorage->getId});
}

2
lib/WebGUI/Asset/Sku/Product.pm
View file

@ -47,7 +47,7 @@ sub addRevision {
my $newSelf = $self->SUPER::addRevision(@_);
if ($newSelf->getRevisionCount > 1) {
foreach my $field (qw(image1 image2 image3 brochure manual warranty)) {
if ($self->get($field)) {
if ($self->get($field) && $self->get($field) ne $newSelf->get($field)) {
my $newStorage = WebGUI::Storage->get($self->session,$self->get($field))->copy;
$newSelf->update({$field=>$newStorage->getId});
}

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

@ -71,12 +71,10 @@ Override the default method in order to deal with attachments.
sub addRevision {
my $self = shift;
my $oldStorage = $self->get('storageId');
my $newSelf = $self->SUPER::addRevision(@_);
my $newStorageId = $newSelf->get('storageId');
if ($newStorageId && $newStorageId eq $self->get('storageId')) {
my $newStorage = WebGUI::Storage->get($self->session, $newStorageId)->copy;
$newSelf->update({storageId=>$newStorage->getId});
if ($newSelf->get("storageId") && $newSelf->get("storageId") eq $self->get('storageId')) {
my $newStorage = WebGUI::Storage->get($self->session,$self->get("storageId"))->copy;
$newSelf->update({storageId => $newStorage->getId});
}
return $newSelf;
}