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

- fix: Added better error trapping for WikiMaster

Browse source 
- fix: Wiki causes site to fail
 - fix: Wiki Error on plainblack.com
This commit is contained in:
JT Smith 2007-02-01 00:05:22 +00:00
parent 8637563ae6
commit e1bd43b02e
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog/7.x.x.txt
View file

@ -11,6 +11,9 @@
and tested.
- fix: Spectre needs new watch batteries
- fix: Admin.pm (thanks to elnino)
- fix: Added better error trapping for WikiMaster
- fix: Wiki causes site to fail
- fix: Wiki Error on plainblack.com
- fix: lack of testing for valid object creation
- fix: No mention of intermediate upgrade step in gotcha's
- fix: A newly released version of Html::Template fixes a bug with global

21
lib/WebGUI/Asset/Wobject/WikiMaster.pm
View file

@ -23,16 +23,15 @@ sub appendMostPopular {
my $self = shift;
my $var = shift;
my $limit = shift || $self->get("mostPopularCount");
my $rs = $self->session->db->read("select distinct(asset.assetId) from asset left join WikiPage on WikiPage.assetId=asset.assetId
where lineage like ? and lineage<>? and revisionDate = (select max(revisionDate) from WikiPage where assetId = asset.assetId)
and state='published'
order by views desc limit ?", [$self->get("lineage").'%', $self->get("lineage"), $limit]);
while (my ($id) = $rs->array) {
my $asset = WebGUI::Asset->new($self->session, $id, "WebGUI::Asset::WikiPage");
push(@{$var->{mostPopular}}, {
title=>$asset->getTitle,
url=>$asset->getUrl,
});
while (my $asset = @{$self->getLineage(["children"],{returnObjects=>1, limit=>$limit, includeOnlyClasses=>["WebGUI::Asset::WikiPage"]})}) {
if (defined $asset) {
push(@{$var->{mostPopular}}, {
title=>$asset->getTitle,
url=>$asset->getUrl,
});
} else {
$self->session->errorHandler->error("Couldn't instanciate wikipage for master ".$self->getId);
}
}
}
@ -42,7 +41,7 @@ sub appendRecentChanges {
my $var = shift;
my $limit = shift || $self->get("recentChangesCount") || 50;
my $rs = $self->session->db->read("select asset.assetId, revisionDate from assetData left join asset on assetData.assetId=asset.assetId where
lineage like ? and lineage<>? order by revisionDate desc limit ?", [$self->get("lineage").'%', $self->get("lineage"), $self->get("recentChangesCount")]);
lineage like ? and lineage<>? and status='approved' order by revisionDate desc limit ?", [$self->get("lineage").'%', $self->get("lineage"), $self->get("recentChangesCount")]);
while (my ($id, $version) = $rs->array) {
my $asset = WebGUI::Asset->new($self->session, $id, "WebGUI::Asset::WikiPage", $version);
my $user = WebGUI::User->new($self->session, $asset->get("actionTakenBy"));