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

fixed bug #11052; includes test

Browse source
This commit is contained in:
Wes Morgan 2009-09-26 01:10:15 -06:00
parent d088386e2c
commit 4583ce14fb
2 changed files with 46 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Asset/Shortcut.pm
View file

@ -267,8 +267,14 @@ Return the largest of either the asset revision date, or the shortcut revision d
sub getContentLastModified { sub getContentLastModified {
my $self = shift; my $self = shift;
my $assetRev = $self->get('revisionDate'); my $assetRev = $self->get('revisionDate');
my $shortcuttedRev = $self->getShortcut->get('revisionDate'); my $shortcut = $self->getShortcut;
return $assetRev > $shortcuttedRev ? $assetRev : $shortcuttedRev; my $shortcuttedRev;
if (defined $shortcut) {
$shortcuttedRev = $shortcut->get('revisionDate');
return $assetRev > $shortcuttedRev ? $assetRev : $shortcuttedRev;
} else {
return 0;
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

41
t/Asset/Shortcut/010-linked-asset.t
View file

@ -50,7 +50,7 @@ END {
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Tests # Tests
plan tests => 9; plan tests => 10;
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Test shortcut's link to original asset # Test shortcut's link to original asset
@ -106,6 +106,42 @@ ok(
"Restore Linked Asset: Shortcut is not in trash", "Restore Linked Asset: Shortcut is not in trash",
); );
#----------------------------------------------------------------------------
# Test purging snippet but keeping shortcut doesn't cause
# getContentLastModified to generate an error; makes sure that
# http://www.webgui.org/use/bugs/tracker/11052 stays fixed.
$session->db->beginTransaction();
$session->db->write("delete from assetData where assetId = ?",
[$snippet->getId]);
$session->db->write("delete from asset where assetId = ?",
[$snippet->getId]);
$session->db->write("delete from snippet where assetId = ?",
[$snippet->getId]);
$session->db->commit();
my $contentLastModified;
eval {
$contentLastModified = $shortcut->getContentLastModified();
};
is(
$contentLastModified, 0,
"Purged Linked Asset: getContentLastModified returns 0",
);
# re-init so further tests will work
$snippet
= $node->addChild({
className => "WebGUI::Asset::Snippet",
});
$shortcut
= $node->addChild({
className => "WebGUI::Asset::Shortcut",
shortcutToAssetId => $snippet->getId,
});
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Test purging snippet purges shortcut also # Test purging snippet purges shortcut also
$snippet->purge; $snippet->purge;
@ -114,5 +150,4 @@ $shortcut = WebGUI::Asset->newByDynamicClass($session, $shortcut->getId);
ok( ok(
!defined $shortcut, !defined $shortcut,
"Purge Linked Asset: Shortcut is not defined", "Purge Linked Asset: Shortcut is not defined",
); );