Attachment 16264 Details for Bug 9554 – Bug 9554: single quote in didyoumean

[patch] Bug 9554: single quote in didyoumean

Bug-9554-single-quote-in-didyoumean.patch (text/plain), 5.58 KB, created by Jonathan Druart on 2013-03-18 15:21:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2013-03-18 15:21:27 UTC

Size: 5.58 KB

patch

obsolete

>From 51101433a3b3cb37dd84aaf954414efad14f8894 Mon Sep 17 00:00:00 2001
>From: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
>Date: Mon, 4 Feb 2013 17:48:58 +0100
>Subject: [PATCH] Bug 9554: single quote in didyoumean
>
>When using "url" or "uri" template toolkit filters, I noticed that double quotes are escaped (%22), but not single quotes.
>This causes sometimes a problem when URL is written in JavaScript code, in a string delimited by single quotes.
>
>This patch corrects by using double quotes for js strings.
>Also, adds a test for "didyoumean" feature : when feature is not activated, do not add corresponding javascript.
>
>Test plan :
>- activate OpacHighlightedWords syspref
>- activate "didyoumean" feature for OPAC
>- perform a search begining with a  single quote (ie "'sport")
>=> look for javascript errors (you may use firebug)
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> .../prog/en/modules/opac-results-grouped.tt        |    2 +-
> .../opac-tmpl/prog/en/modules/opac-results.tt      |   22 ++++++++++++--------
> .../opac-tmpl/prog/en/modules/svc/suggestion.tt    |    6 +++---
> 3 files changed, 17 insertions(+), 13 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
>index 70aae62..44fd575 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
>@@ -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 | uri %]');
>+            $(this).attr("href", $(this).attr("href") + "&query_desc=[% query_desc | uri %]");
>         });
>     [% END %]
> 
>diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
>index 04d02ba..28b0932 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
>@@ -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 | uri %]');
>+            $(this).attr("href", $(this).attr("href") + "&query_desc=[% query_desc | uri %]");
>         });
>     [% END %]
> 
>@@ -303,12 +303,16 @@ $(document).ready(function(){
>     [% IF OPACLocalCoverImages %]KOHA.LocalCover.GetCoverFromBibnumber(false);[% END %]
>     [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
> 
>-    $('#didyoumean').load('/cgi-bin/koha/svc/suggestion?render=stub&q=[% querystring | uri %]',
>+[% IF ( DidYouMean ) %]
>+    $("#didyoumean").load("/cgi-bin/koha/svc/suggestion?render=stub&q=[% querystring |uri %]",
>         function() {
>-            $('.searchsuggestion').parent().parent().css({
>-                'border-color': '#F4ECBE',
>-                'background-color': '#FFFBEA'});
>-            } );
>+            $(".searchsuggestion").parent().parent().css({
>+                "border-color": "#F4ECBE",
>+                "background-color": "#FFFBEA"
>+            });
>+        });
>+[% END %]
>+
> });
> 
> //]]>
>@@ -325,7 +329,7 @@ $(document).ready(function(){
>     <div class="yui-b">
>     <div id="userresults" class="container">
>     [% IF ( DidYouMean ) %]
>-        <div id='didyoumean'>Not what you expected? Check for <a href='/cgi-bin/koha/svc/suggestion?render=standalone&amp;q=[% querystring | uri %]'>suggestions</a></div>
>+        <div id="didyoumean">Not what you expected? Check for <a href="/cgi-bin/koha/svc/suggestion?render=standalone&amp;q=[% querystring |uri %]">suggestions</a></div>
>     [% END %]
>     <div id="top-pages">[% INCLUDE 'page-numbers.inc' %]</div>
>   [% IF ( koha_spsuggest ) %]
>@@ -607,8 +611,8 @@ $(document).ready(function(){
> [% END %]
> 
> [% END %]
>-                <input type="hidden" name='biblionumber'  value="[% SEARCH_RESULT.biblionumber %]" />
>-                <input type="hidden" name='loggedinuser'  value="[% loggedinuser %]" />
>+                <input type="hidden" name="biblionumber"  value="[% SEARCH_RESULT.biblionumber %]" />
>+                <input type="hidden" name="loggedinuser"  value="[% loggedinuser %]" />
> 
>                 [% IF (  SEARCH_RESULT.rating_total ) > 0  %]
>                     <span id="rating_total_[% SEARCH_RESULT.biblionumber %]">&nbsp;&nbsp;([% SEARCH_RESULT.rating_total %] votes)</span>
>diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/svc/suggestion.tt b/koha-tmpl/opac-tmpl/prog/en/modules/svc/suggestion.tt
>index 1bc77ba..7960445 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/svc/suggestion.tt
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/svc/suggestion.tt
>@@ -14,13 +14,13 @@
> [% END %]
> [% IF suggestions && suggestions.size %]
>     <div>
>-    <span class='suggestionlabel'>Did you mean:</span>
>+    <span class="suggestionlabel">Did you mean:</span>
>     [% FOREACH suggestion IN suggestions %]
>-        <span class='searchsuggestion'><a href='/cgi-bin/koha/opac-search.pl?q=[% suggestion.search | uri %]'>[% suggestion.label %]</a></span>
>+        <span class="searchsuggestion"><a href="/cgi-bin/koha/opac-search.pl?q=[% suggestion.search |uri %]">[% suggestion.label |html %]</a></span>
>     [% END %]
>     </div>
> [% ELSE %]
>-    <span class='nosuggestions'>Sorry, no suggestions.</span>
>+    <span class="nosuggestions">Sorry, no suggestions.</span>
> [% END %]
> [% IF (render=='standalone') %]
>     </div>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 9554: 15093 | 15095 | 15177 | 16264 | 17174