diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index aa805fadb..4eaf28705 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -38,6 +38,7 @@ - autocommit for packages is handled by web method, not API method - fix: importing packages generates orphaned duplicates of all attached storage locations - show fields in tabs on DataForm default email template + - fix: error rolling back version tags if a parent has a later revision date than its child 7.5.0 - rfe: Search Asset returns URLs diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm index b7b4c2f6a..c6214ca22 100644 --- a/lib/WebGUI/Asset/Wobject/Calendar.pm +++ b/lib/WebGUI/Asset/Wobject/Calendar.pm @@ -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) { diff --git a/lib/WebGUI/VersionTag.pm b/lib/WebGUI/VersionTag.pm index a9cda6981..8066b1a99 100644 --- a/lib/WebGUI/VersionTag.pm +++ b/lib/WebGUI/VersionTag.pm @@ -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;