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

No need to check out separate tags for auxiliary assets like Folders inside the Story Archive.

Browse source
This commit is contained in:
Colin Kuskie 2011-01-04 18:06:33 -08:00
parent 8bd2deabe3
commit e87358d0cb
1 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/WebGUI/Asset/Wobject/StoryArchive.pm
View file

@ -302,19 +302,7 @@ sub getFolder {
my $folder = eval { WebGUI::Asset->newByUrl($session, $folderUrl); }; my $folder = eval { WebGUI::Asset->newByUrl($session, $folderUrl); };
return $folder if !Exception::Class->caught(); return $folder if !Exception::Class->caught();
##The requested folder doesn't exist. Make it and autocommit it. ##The requested folder doesn't exist. Make it.
##For a fully automatic commit, save the current tag, create a new one
##with the commit without approval workflow, commit it, then restore
##the original if it exists
my ($oldVersionTag, $newVersionTag);
$oldVersionTag = WebGUI::VersionTag->getWorking($session, 'noCreate');
if ($self->hasBeenCommitted) {
$newVersionTag = WebGUI::VersionTag->create($session, { workflowId => 'pbworkflow00000000003', });
$newVersionTag->setWorking;
$newVersionTag->set({ name => 'Adding folder '. $folderName. ' to archive '. $self->getUrl});
}
##Call SUPER because my addChild calls getFolder ##Call SUPER because my addChild calls getFolder
$folder = $self->addChild({ $folder = $self->addChild({
@ -325,9 +313,6 @@ sub getFolder {
isHidden => 1, isHidden => 1,
styleTemplateId => $self->styleTemplateId, styleTemplateId => $self->styleTemplateId,
}); });
$newVersionTag->commit() if $newVersionTag;
##Restore the old one, if it exists
$oldVersionTag->setWorking() if $oldVersionTag;
##Get a new version of the asset from the db with the correct state ##Get a new version of the asset from the db with the correct state
$folder = $folder->cloneFromDb(); $folder = $folder->cloneFromDb();