Revision Event storage locations.

This commit is contained in:
Colin Kuskie 2009-08-09 04:35:16 +00:00
parent d2b9be686c
commit af2d858f68
3 changed files with 25 additions and 1 deletions

View file

@ -1,4 +1,5 @@
7.7.17 7.7.17
- fixed #10738: Events do not revision their storage locations
- fixed #10724: gotcha.txt for 7.7.17 enhanced - fixed #10724: gotcha.txt for 7.7.17 enhanced
- fixed #10316: Cannot view pending version tags - fixed #10316: Cannot view pending version tags
- fixed #10710: testEnvironment 7.6.33 - fixed #10710: testEnvironment 7.6.33

View file

@ -65,6 +65,10 @@ sub addRevision {
$sequenceNumber = 0; $sequenceNumber = 0;
} }
$newRev->update({iCalSequenceNumber => $sequenceNumber}); $newRev->update({iCalSequenceNumber => $sequenceNumber});
if ($newRev->get("storageId") && $newRev->get("storageId") eq $self->get('storageId')) {
my $newStorage = WebGUI::Storage->get($self->session,$self->get("storageId"))->copy;
$newRev->update({storageId => $newStorage->getId});
}
return $newRev; return $newRev;
} }

View file

@ -19,7 +19,7 @@ use WebGUI::Asset::Event;
use Test::More; # increment this value for each test you create use Test::More; # increment this value for each test you create
use Test::Deep; use Test::Deep;
plan tests => 16; plan tests => 18;
my $session = WebGUI::Test->session; my $session = WebGUI::Test->session;
@ -110,3 +110,22 @@ my $event5 = $cal->addChild($properties2, $properties2->{id});
is($event5->getIcalStart, '20000831', 'getIcalStart, with no start time'); is($event5->getIcalStart, '20000831', 'getIcalStart, with no start time');
is($event5->getIcalEnd, '20000901', 'getIcalEnd, with no end time, day incremented'); is($event5->getIcalEnd, '20000901', 'getIcalEnd, with no end time, day incremented');
my $properties3 = {};
$properties3->{startDate} = '2000-08-31';
$properties3->{endDate} = '2000-08-31';
$properties3->{id} = 'EventAssetTestStorage6';
$properties3->{url} = 'event-asset-test6';
$properties3->{className} = 'WebGUI::Asset::Event';
my $eventStorage = WebGUI::Storage->create($session);
WebGUI::Test->storagesToDelete($eventStorage);
$properties3->{storageId} = $eventStorage->getId;
my $event6 = $cal->addChild($properties3, $properties3->{id});
sleep 2;
my $event6a = $event6->addRevision({ title => 'Event with storage', });
ok($session->id->valid($event6a->get('storageId')), 'addRevision gives the new revision a valid storageId');
isnt($event6a->get('storageId'), $event6->get('storageId'), '... and it is different from the previous revision');