Merge commit '4969f31e1f' into WebGUI8

This commit is contained in:
Colin Kuskie 2010-06-26 14:37:31 -07:00
commit e5b82bc861
61 changed files with 2199 additions and 521 deletions

View file

@ -686,11 +686,15 @@ sub rollback {
my $revision = WebGUI::Asset->newById($session, $id, $revisionDate);
next REVISION unless $revision;
$outputSub->(sprintf $i18n->get('Rolling back %s'), $revision->getTitle);
$revision->purgeRevision;
$revision->purgeRevision;
}
my $instance = $self->getWorkflowInstance;
if ($instance) {
$instance->delete;
}
$session->db->write("delete from assetVersionTag where tagId=?", [$tagId]);
$self->clearWorking;
return 1;
$session->db->write("delete from assetVersionTag where tagId=?", [$tagId]);
$self->clearWorking;
return 1;
}
#-------------------------------------------------------------------