From f7e0c9f940e8a80d343fa945289fd07c049c5e39 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 15 Jun 2010 14:11:26 -0700 Subject: [PATCH] Archived content should be shown in the Account/Contributions screen. Fixes bug #11643. --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Account/Contributions.pm | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 8f649a2e8..fbec94668 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -19,6 +19,7 @@ - fixed #11629: WebGUI Collateral Manager = Error - fixed #11622: Archived CSS entries displayable. - fixed #11560: Email footer hidden from Outlook users + - fixed #11643: Account/Contributions: does not show archived content 7.9.6 - new checkbox in the asset manager for clearing the package flag on import diff --git a/lib/WebGUI/Account/Contributions.pm b/lib/WebGUI/Account/Contributions.pm index 1a5a59252..73e17c70c 100644 --- a/lib/WebGUI/Account/Contributions.pm +++ b/lib/WebGUI/Account/Contributions.pm @@ -180,8 +180,9 @@ sub www_view { 'WebGUI::Asset::WikiPage', 'WebGUI::Asset::Post::Thread', ], - whereClause => "asset.createdBy = '$userId' or assetData.ownerUserId = '$userId'", - orderByClause => "$sortBy $sortDir" + statusToInclude => [ qw/approved archived/ ], + whereClause => "asset.createdBy = '$userId' or assetData.ownerUserId = '$userId'", + orderByClause => "$sortBy $sortDir" } );