From a0a055296b607aa4b83af097cc984ce888bfe906 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Fri, 5 Jan 2007 15:52:25 +0000 Subject: [PATCH] fix: Closed Posts Displaying in CS --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/Collaboration.pm | 7 ++++--- lib/WebGUI/VersionTag.pm | 4 ---- lib/WebGUI/i18n/English/Asset_WikiMaster.pm | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 0a1167a85..f8828f898 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -2,6 +2,7 @@ - fix: SQLForm - cannot add new asset (Martin Kamerbeek / Oqapi) - fix: Daily recurring payment reports should now be sent to the configured "commerceSendDailyReportTo" address. + - fix: Closed Posts Displaying in CS 7.3.3 - fix: Wiki Purge throws fatal diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index 5df7777c7..22849bd81 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -1090,14 +1090,15 @@ sub view { and asset.state='published' and asset.className='WebGUI::Asset::Post::Thread' and assetData.revisionDate=( - SELECT + select max(revisionDate) from assetData where assetData.assetId=asset.assetId - and (status='approved' or tagId=".$self->session->db->quote($self->session->scratch->get("versionTag")).") - ) + and (status='approved' or status='archived') + ) + and status='approved' group by assetData.assetId order by diff --git a/lib/WebGUI/VersionTag.pm b/lib/WebGUI/VersionTag.pm index 1609a9bdc..440329a7e 100644 --- a/lib/WebGUI/VersionTag.pm +++ b/lib/WebGUI/VersionTag.pm @@ -365,10 +365,6 @@ sub requestCommit { A class method. Eliminates all revisions of all assets created under a specific version tag. Also removes the version tag. -=head3 tagId - -The unique identifier of the version tag to be purged. - =cut sub rollback { diff --git a/lib/WebGUI/i18n/English/Asset_WikiMaster.pm b/lib/WebGUI/i18n/English/Asset_WikiMaster.pm index c21587766..9647362f8 100644 --- a/lib/WebGUI/i18n/English/Asset_WikiMaster.pm +++ b/lib/WebGUI/i18n/English/Asset_WikiMaster.pm @@ -1,8 +1,8 @@ package WebGUI::i18n::English::Asset_WikiMaster; our $I18N = { - 'assetName' => - { lastUpdated => 1160157064, message => 'Wiki' }, + 'assetName' => { lastUpdated => 1160157064, message => 'Wiki' }, + 'asset description' => { lastUpdated => 1160157064, message => q|A wiki is a collaborative content publishing mechanism. Traditionally wiki's use the wiki markup language, but that's generally not much easier to deal with than HTML, so WebGUI's wiki instead just uses a rich editor to help users publish rich great looking content.| }, mostPopularLabel => {message=>q|Most Popular|, lastUpdated=>0}, recentChangesLabel => {message=>q|Recent Changes|, lastUpdated=>0},