[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.00-32-g7fd329a

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.20.x has been updated
       via  7fd329a520e6123ff61a74efd675370d7877b24e (commit)
       via  ac78b4aa3f4cb38cbf524f74b5a8a12857e67ee8 (commit)
       via  433441685b68effebdba5876103c3a08cf62f6ee (commit)
      from  1b56130e80751bb245757af3698c41aefc87bf88 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7fd329a520e6123ff61a74efd675370d7877b24e
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Sun May 24 18:00:57 2015 +0200

    Bug 14263: Fix export of item search results when translated
    
    This csv does not use the correct way to display headers.
    They should be put in a separate file to get a correct display.
    Without this patch, the first line of the generated file contains the
    headers + data
    
    Test plan:
    1/ choose a language and update + translate the templates
    for instance:
      cd misc/translate;
      ./translate update es-ES; ./translate install es-ES
    2/ Go to the item search form using this language
    3/ Launch a search and select CSV to display the results.
    The CSV headers should be correct
    
    Signed-off-by: Frederic Demians <f.demians at tamil.fr>
      Seen the bug. Works as described.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit ece2b02a57fdb692c02f00540df436af1f5ba971)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit ac78b4aa3f4cb38cbf524f74b5a8a12857e67ee8
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Apr 28 12:52:36 2015 +0200

    Bug 12320: Remove deprecated construct to delete cookie showColumns
    
      $.cookie('foo', null);
    is deprecated and should be replaced with
      $.removeCookie('foo');
    
    This patch replaces the occurrences for the "showColumns" cookie.
    
    Before this patch, there was a bug on the batchmod tools.
    To reproduce the issue:
    1/ Go on the Batch item modification tool
    2/ Fill the textarea with barcodes and submit
    3/ Click on some column names (to create the cookie)
    4/ Click on 'Show all columns" (to set the cookie to null)
    5/ Don't submit and repeat steps 1 & 2
    6/ You should see a js error:
      Error: Syntax error, unrecognized expression: :nth-child
        ...break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecogni...
    
    Test plan:
    Confirm the issue has gone away and there is no regression on the column
    selection
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    No js error, no regressions, no errors
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 0fa0297d7da7af6a9f4cd82b34ac86018391289f)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 433441685b68effebdba5876103c3a08cf62f6ee
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Apr 28 12:52:00 2015 +0200

    Bug 12320: Remove deprecated construct to delete cookie holdfor
    
      $.cookie('foo', null);
    is deprecated and should be replaced with
      $.removeCookie('foo');
    
    This patch replaces the occurrences for the "holdfor" cookie.
    
    Test plan:
    1/ Search for a patron
    2/ On the patron detail page, click on "search to hold"
    3/ Search for records
    4/ On the results page, click on "Place hold" > "Forget PATRON"
    5/ Reload the page.
    6/ The "Place hold" button should not contain the patron anymore
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Works as described, no errors
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 04f5e7d4e7db833c18afe27a4dc4fd5b66b41099)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

-----------------------------------------------------------------------

Summary of changes:
 catalogue/itemsearch.pl                                      |    5 ++++-
 .../prog/en/includes/catalogue/itemsearch_item.csv.inc       |    2 +-
 .../csv_headers/catalogue/itemsearch.tt}                     |    3 ---
 koha-tmpl/intranet-tmpl/prog/en/js/pages/batchMod.js         |   10 +++++-----
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js           |    2 +-
 .../prog/en/modules/catalogue/itemsearch.csv.tt              |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt  |    9 ++++++++-
 8 files changed, 21 insertions(+), 14 deletions(-)
 copy koha-tmpl/intranet-tmpl/prog/en/{modules/catalogue/itemsearch.csv.tt => includes/csv_headers/catalogue/itemsearch.tt} (59%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/empty_line.inc


hooks/post-receive
-- 
main Koha release repository