Forward ported deployPackage autocommit fix.

This commit is contained in:
Colin Kuskie 2009-06-12 15:24:16 +00:00
parent b6ec0316f9
commit 9a07cf9caf
2 changed files with 7 additions and 0 deletions

View file

@ -1,5 +1,6 @@
7.7.11
- Fixed a bug where empty version tags were not deleted. (Martin Kamerbeek / Oqapi)
- fixed: deploying a package doesn't commit version tag with autocommit on
7.7.10
- Made a change to LDAP auth that adds an OR to that query so that it also searches for a row with fieldData REGEXP '^uid=(value-from-ldap-directory-server),'. (Wes Morgan)

View file

@ -306,6 +306,12 @@ sub www_deployPackage {
$deployedTreeMaster->update({isPackage=>0, styleTemplateId=>$self->get("styleTemplateId")});
}
}
if (WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session, {
allowComments => 1,
returnUrl => $self->getUrl,
}) eq 'redirect') {
return undef;
};
if ($self->session->form->param("proceed") eq "manageAssets") {
$self->session->http->setRedirect($self->getUrl('op=assetManager'));
} else {