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

almost done fixing addRevision changes

Browse source
This commit is contained in:
Doug Bell 2010-11-16 11:18:41 -06:00
parent 3ce9198220
commit 1866c593ea
25 changed files with 186 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/AssetHelper/EditBranch.pm
View file

@ -319,6 +319,7 @@ sub www_editBranchSave {
my %data;
my $pb = WebGUI::ProgressBar->new($session);
my $i18n = WebGUI::International->new($session, 'Asset');
my $tag = WebGUI::VersionTag->getWorking( $session );
$data{isHidden} = $form->yesNo("isHidden") if ($form->yesNo("change_isHidden"));
$data{newWindow} = $form->yesNo("newWindow") if ($form->yesNo("change_newWindow"));
$data{encryptPage} = $form->yesNo("encryptPage") if ($form->yesNo("change_encryptPage"));
@ -401,10 +402,11 @@ sub www_editBranchSave {
my $revision;
if (scalar %$newData > 0) {
$revision = $descendant->addRevision(
$newData,
{ %$newData, tagId => $tag->getId, status => "pending" },
undef,
{skipAutoCommitWorkflows => 1, skipNotification => 1},
);
$revision->setVersionLock;
}
else {
$revision = $descendant;

7
lib/WebGUI/AssetHelper/Lock.pm
View file

@ -52,7 +52,12 @@ sub process {
return { error => sprintf $i18n->get('already locked'), $asset->getTitle};
}
$asset = $asset->addRevision;
my $tag = WebGUI::VersionTag->getWorking( $session );
$asset = $asset->addRevision({
tagId => $tag->getId,
status => "pending",
});
$asset->setVersionLock;
return {
message => sprintf($i18n->get('locked asset'), $asset->getTitle),
};