fixed: Creating a shortcut creates a version tag even with autocommit turned on
This commit is contained in:
parent
64ac52e088
commit
5b78160079
2 changed files with 14 additions and 1 deletions
|
|
@ -1,4 +1,5 @@
|
|||
7.5.11
|
||||
- fixed: Creating a shortcut creates a version tag even with autocommit turned on
|
||||
- fixed: userImport.pl overwrites settings when updating users
|
||||
- fixed: Collaboration RSS link in header doesn't indicate title
|
||||
- fixed: edit branch can't update URLs on most assets
|
||||
|
|
|
|||
|
|
@ -272,10 +272,22 @@ sub www_createShortcut {
|
|||
templateId=>'PBtmpl0000000000000140'
|
||||
});
|
||||
|
||||
if (! $isOnDashboard) {
|
||||
$child->cut;
|
||||
}
|
||||
if ($self->session->setting->get("autoRequestCommit")) {
|
||||
if ($self->session->setting->get("skipCommitComments")) {
|
||||
WebGUI::VersionTag->getWorking($self->session)->requestCommit;
|
||||
} else {
|
||||
$self->session->http->setRedirect($self->getUrl(
|
||||
"op=commitVersionTag;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId
|
||||
));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
if ($isOnDashboard) {
|
||||
return $self->getParent->www_view;
|
||||
} else {
|
||||
$child->cut;
|
||||
$self->session->asset($self->getContainer);
|
||||
return $self->session->asset->www_manageAssets if ($self->session->form->process("proceed") eq "manageAssets");
|
||||
return $self->session->asset->www_view;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue