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

fixed: Creating a shortcut creates a version tag even with autocommit turned on

Browse source
This commit is contained in:
Graham Knop 2008-06-11 19:17:28 +00:00
parent 64ac52e088
commit 5b78160079
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -1,4 +1,5 @@
7.5.11 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: userImport.pl overwrites settings when updating users
- fixed: Collaboration RSS link in header doesn't indicate title - fixed: Collaboration RSS link in header doesn't indicate title
- fixed: edit branch can't update URLs on most assets - fixed: edit branch can't update URLs on most assets

14
lib/WebGUI/AssetClipboard.pm
View file

@ -272,10 +272,22 @@ sub www_createShortcut {
templateId=>'PBtmpl0000000000000140' 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) { if ($isOnDashboard) {
return $self->getParent->www_view; return $self->getParent->www_view;
} else { } else {
$child->cut;
$self->session->asset($self->getContainer); $self->session->asset($self->getContainer);
return $self->session->asset->www_manageAssets if ($self->session->form->process("proceed") eq "manageAssets"); return $self->session->asset->www_manageAssets if ($self->session->form->process("proceed") eq "manageAssets");
return $self->session->asset->www_view; return $self->session->asset->www_view;