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

fixed: Search asset shows blank page after searching

Browse source
This commit is contained in:
Graham Knop 2008-10-06 15:55:32 +00:00
parent d37ded3ddc
commit faa9e24344
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@
- fixed: Combo box does not show possible values in Thingy (SDH Consulting - fixed: Combo box does not show possible values in Thingy (SDH Consulting
Group) Group)
- fixed: Cross site scripting issue on operation pages - fixed: Cross site scripting issue on operation pages
- fixed: Search asset shows blank page after searching
7.6.0 7.6.0
- added: users may now customize the post received page for the CS - added: users may now customize the post received page for the CS

14
lib/WebGUI/Asset/Wobject/Search.pm
View file

@ -180,7 +180,7 @@ sub view {
#Instantiate the highlighter #Instantiate the highlighter
my @words = split(/\s+/,$keywords); my @words = split(/\s+/,$keywords);
my @wildcards = map { "%" } @words; my @wildcards = map { "%" } @words;
my $hl = new HTML::Highlight ( my $hl = HTML::Highlight->new(
words => \@words, words => \@words,
wildcards => \@wildcards wildcards => \@wildcards
); );
@ -189,10 +189,10 @@ sub view {
my $p = $search->getPaginatorResultSet ( my $p = $search->getPaginatorResultSet (
$self->getUrl('doit=1;keywords='.$session->url->escape($keywords)) $self->getUrl('doit=1;keywords='.$session->url->escape($keywords))
); );
my @results = (); my @results = ();
foreach my $data (@{$p->getPageData}) { foreach my $data (@{$p->getPageData}) {
next unless ( next unless (
$user->userId eq $data->{ownerUserId} $user->userId eq $data->{ownerUserId}
|| $user->isInGroup($data->{groupIdView}) || $user->isInGroup($data->{groupIdView})
|| $user->isInGroup($data->{groupIdEdit}) || $user->isInGroup($data->{groupIdEdit})
@ -205,9 +205,9 @@ sub view {
$properties->{url} = $asset->getContainer->get("url"); $properties->{url} = $asset->getContainer->get("url");
} }
#Add highlighting #Add highlighting
$properties->{'title' } = $hl->highlight($properties->{title}); $properties->{'title' } = $hl->highlight($properties->{title} || '');
$properties->{'title_nohighlight' } = $properties->{title}; $properties->{'title_nohighlight' } = $properties->{title};
$properties->{'synopsis' } = $hl->highlight($properties->{synopsis}); $properties->{'synopsis' } = $hl->highlight($properties->{synopsis} || '');
$properties->{'synopsis_nohighlight'} = $properties->{synopsis}; $properties->{'synopsis_nohighlight'} = $properties->{synopsis};
push(@results, $properties); push(@results, $properties);
$var{results_found} = 1; $var{results_found} = 1;