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

fix rolling back version tags with an asset with a later revisionDate than a child

Browse source
This commit is contained in:
Graham Knop 2008-02-08 02:10:46 +00:00
parent fb4d77e958
commit fb81012d1a
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -1357,8 +1357,9 @@ sub viewWeek {
my $start_dow = ($dt_event_start->day_of_week - $first_dow) % 7;
my $end_dow = ($dt_event_end->day_of_week - $first_dow) % 7;
my $sequence_number = $session->db->dbh->selectcol_arrayref("SELECT sequenceNumber FROM Event WHERE assetId
= ? ORDER BY revisionDate desc LIMIT 1",{},$event_asset_id)->[0];
my $sequence_number = $session->db->dbh->selectcol_arrayref(
"SELECT sequenceNumber FROM Event WHERE assetId = ? ORDER BY revisionDate desc LIMIT 1",
{},$event_asset_id)->[0];
foreach my $weekDay ($start_dow .. $end_dow) {

2
lib/WebGUI/VersionTag.pm
View file

@ -431,7 +431,7 @@ sub rollback {
$self->session->errorHandler->warn("You cannot rollback a tag that is required for the system to operate.");
return 0;
}
my $sth = $self->session->db->read("select asset.className, asset.assetId, assetData.revisionDate from assetData left join asset on asset.assetId=assetData.assetId where assetData.tagId = ? order by assetData.revisionDate desc, asset.lineage desc", [ $tagId ]);
my $sth = $self->session->db->read("select asset.className, asset.assetId, assetData.revisionDate from assetData left join asset on asset.assetId=assetData.assetId where assetData.tagId = ? order by asset.lineage desc, assetData.revisionDate desc", [ $tagId ]);
while (my ($class, $id, $revisionDate) = $sth->array) {
my $revision = WebGUI::Asset->new($self->session,$id, $class, $revisionDate);
$revision->purgeRevision;