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

WikiMaster keyword pagination fixes, re # 10856.

Browse source 
Add pagination template variables to the default byKeyword template.
Fix pagination URL for keywords.

Conflicts:

	docs/changelog/7.x.x.txt
This commit is contained in:
Colin Kuskie 2009-09-03 09:00:50 -07:00
parent fea30d0db0
commit 4ea146fc07
3 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,5 @@
7.8.0 7.8.0
- fixed #10856: no paginate in wiki keyword search
- fixed #10877: getProfileUrl() broken - fixed #10877: getProfileUrl() broken
- fixed #10844: Ad Sales: No template variable Help - fixed #10844: Ad Sales: No template variable Help
- fixed #10873: Code editor breaks CSS comments - fixed #10873: Code editor breaks CSS comments

BIN
docs/upgrades/packages-7.7.20/wiki-master-by-keyword-template.tmpl.wgpkg Normal file
View file

Binary file not shown.

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

@ -542,7 +542,7 @@ sub www_byKeyword {
keyword => $keyword, keyword => $keyword,
usePaginator => 1, usePaginator => 1,
}); });
$p->setBaseUrl($self->getUrl("func=byKeyword")); $p->setBaseUrl($self->getUrl("func=byKeyword;keyword=".$keyword));
foreach my $assetData (@{$p->getPageData}) { foreach my $assetData (@{$p->getPageData}) {
my $asset = WebGUI::Asset->newByDynamicClass($self->session, $assetData->{assetId}); my $asset = WebGUI::Asset->newByDynamicClass($self->session, $assetData->{assetId});
next unless defined $asset; next unless defined $asset;