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

Merge branch 'master' of git@github.com:plainblack/webgui

Browse source
This commit is contained in:
Martin Kamerbeek 2009-12-18 12:11:55 +01:00
commit 6bdf5f42ed
7 changed files with 171 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/WebGUI/AssetVersioning.pm
View file

@ -92,7 +92,7 @@ sub addRevision {
my $autoCommitId = $self->getAutoCommitWorkflowId() unless ($options->{skipAutoCommitWorkflows});
my $workingTag;
my ($workingTag, $oldWorking);
if ( $autoCommitId ) {
$workingTag
= WebGUI::VersionTag->create( $self->session, {
@ -109,7 +109,9 @@ sub addRevision {
$workingTag = WebGUI::VersionTag->getWorking( $self->session );
}
else {
my $oldWorking = WebGUI::VersionTag->getWorking($self->session, 'noCreate');
$workingTag = WebGUI::VersionTag->new( $self->session, $parentAsset->get('tagId') );
$workingTag->setWorking();
}
}
@ -163,6 +165,7 @@ sub addRevision {
$newVersion->setVersionLock;
$newVersion->update(\%mergedProperties);
$newVersion->setAutoCommitTag($workingTag) if (defined $autoCommitId);
$oldWorking->setWorking if $oldWorking;
return $newVersion;
}