gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 9239 QA follow-up: fix highlighting and merge error 

QP searches with && broke search highlighting on the OPAC details page.
This patch corrects encoding of the query_desc parameter that is passed
to the details page.

My last attempt at rebasing also transposed the variable for index
names with the variable for operators, meaning that the dropdown in
the basic search did not work.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes some problems raised during QA successfully.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This commit is contained in:
Jared Camins-Esakov 2013-03-04 12:55:12 -05:00
parent 09de3b93be
commit ed521b8ebb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Search.pm
View File

@ -1189,7 +1189,7 @@ sub parseQuery {
$query .= $operators[ $ii - 1 ] eq 'or' ? ' || ' : ' && '
if ($query);
$query .=
( $operators[$ii] ? "$operators[$ii]:" : '' ) . $operands[$ii];
( $indexes[$ii] ? "$indexes[$ii]:" : '' ) . $operands[$ii];
}
foreach my $limit (@limits) {
}

2
koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
View File

@ -17,7 +17,7 @@ var q_array = new Array(); // will hold the search terms, if possible
$(document).ready(function(){
[% IF ( OpacHighlightedWords ) %]
$('a.title').each(function() {
$(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | url %]');
$(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | uri %]');
});
[% END %]

2
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
View File

@ -105,7 +105,7 @@ function highlightOn() {
$(document).ready(function(){
[% IF ( OpacHighlightedWords ) %]
$('a.title').each(function() {
$(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | url %]');
$(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | uri %]');
});
[% END %]