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

- fix: Direct 6.8.10-7.2+ Upgrade Problem

Browse source
This commit is contained in:
JT Smith 2007-01-30 20:47:50 +00:00
parent 0d0ec2ccca
commit 3df71a5351
7 changed files with 169 additions and 696 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/WebGUI/AssetTrash.pm
View file

@ -88,16 +88,27 @@ sub getAssetsInTrash {
#-------------------------------------------------------------------
=head2 purge ( )
=head2 purge ( [ options ] )
Deletes an asset from tables and removes anything bound to that asset, including descendants.
=head3 options
A hash refernece containing options that change the behavior of this method.
=head4 skipExported
A boolean that, if true, will skip dealing with exported files.
=cut
sub purge {
my $self = shift;
my $options = shift;
return undef if ($self->getId eq $self->session->setting->get("defaultPage") || $self->getId eq $self->session->setting->get("notFoundPage") || $self->get("isSystem"));
$self->_invokeWorkflowOnExportedFiles($self->session->setting->get('purgeWorkflow'), 1);
unless ($options->{skipExported}) {
$self->_invokeWorkflowOnExportedFiles($self->session->setting->get('purgeWorkflow'), 1);
}
my $kids = $self->getLineage(["children"],{returnObjects=>1, statesToInclude=>['published', 'clipboard', 'clipboard-limbo','trash','trash-limbo']});
foreach my $kid (@{$kids}) {
@ -155,7 +166,7 @@ sub _invokeWorkflowOnExportedFiles {
my $workflowId = shift;
my $clearExportedAs = shift;
my ($lastExportedAs) = $self->session->db->quickArray("SELECT lastExportedAs FROM asset WHERE assetId = ?", [$self->getId]);
my ($lastExportedAs) = $self->get("lastExportedAs");
my $wfInstance = WebGUI::Workflow::Instance->create($self->session, { workflowId => $self->session->setting->get('trashWorkflow') });
$wfInstance->setScratch(WebGUI::Workflow::Activity::DeleteExportedFiles::DELETE_FILES_SCRATCH(), Storable::freeze([defined($lastExportedAs)? ($lastExportedAs) : ()]));
$clearExportedAs and $self->session->db->write("UPDATE asset SET lastExportedAs = NULL WHERE assetId = ?", [$self->getId]);