Fix bug with Matrix listing additions committing the current
working tag. This creates a separate tag for the assets under each added listing, modeled somewhat after how CS posts work.
This commit is contained in:
parent
46665266f1
commit
f28d7e8b2d
2 changed files with 18 additions and 4 deletions
|
|
@ -1,5 +1,6 @@
|
|||
7.0.10
|
||||
- fix: mysql and mysqldump were transposed in upgrade.pl --help
|
||||
- fix: adding Matrix listings committing the current version tag
|
||||
|
||||
7.0.9
|
||||
- Removed the need for DateTime::Cron::Simple, which also added the ability
|
||||
|
|
|
|||
|
|
@ -684,14 +684,24 @@ sub www_editListingSave {
|
|||
$data{filename} = $screenshot;
|
||||
$storage->generateThumbnail($screenshot);
|
||||
}
|
||||
|
||||
my $productName = $self->session->form->process("productName");
|
||||
|
||||
my $isNew = 0;
|
||||
if ($self->session->form->process("listingId") eq "new") {
|
||||
$data{maintainerId} = $self->session->user->userId if ($self->session->form->process("listingId") eq "new");
|
||||
|
||||
my $newTag = WebGUI::VersionTag->create($self->session, {
|
||||
name => $productName.' / '.$self->session->user->username,
|
||||
workflowId => 'pbworkflow000000000003' });
|
||||
my $oldTag = WebGUI::VersionTag->getWorking($self->session, 1);
|
||||
$newTag->setWorking;
|
||||
|
||||
my $forum = $self->addChild({
|
||||
className=>"WebGUI::Asset::Wobject::Collaboration",
|
||||
title=>$self->session->form->process("productName"),
|
||||
menuTitle=>$self->session->form->process("productName"),
|
||||
url=>$self->session->form->process("productName"),
|
||||
title=>$productName,
|
||||
menuTitle=>$productName,
|
||||
url=>$productName,
|
||||
groupIdView=>7,
|
||||
groupIdEdit=>3,
|
||||
displayLastReply => 0,
|
||||
|
|
@ -724,7 +734,10 @@ sub www_editListingSave {
|
|||
styleTemplateId => $self->get('styleTemplateId'),
|
||||
printableStyleTemplateId => $self->get('printableStyleTemplateId'),
|
||||
});
|
||||
WebGUI::VersionTag->getWorking($self->session)->commit;
|
||||
$newTag->requestCommit;
|
||||
$newTag->clearWorking;
|
||||
$oldTag->setWorking if defined $oldTag;
|
||||
|
||||
$data{forumId} = $forum->getId;
|
||||
$data{status} = "pending";
|
||||
$isNew = 1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue