[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.06-2-gefb28c4

[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, 17.05.x has been updated
       via  efb28c4af16efbe688322415ae06c6a85fd3454b (commit)
       via  f2a828d5519fb346d6e4d768f80e1ebe3f2ead46 (commit)
      from  e8b134d524110b2990cebd0b7fa00f6c2864a8c4 (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 efb28c4af16efbe688322415ae06c6a85fd3454b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Mon Nov 20 11:05:35 2017 -0500

    Bug 19655: Make To.json escape doesn't escape newlines  to create valid JSON
    
    JSON does not allow real line-breaks. If a field contains them and they are not escaped, a JSON parser will be unable to convert the stringified JSON back into an object.
    
    This is clearly exemplified by the guarantor search, where a multi-line note on the guarantor's record will break the ability to select that guarantor.
    
    Test Plan:
    1) Create Patron A with a "Circulation note" that has multiple lines in it
    2) Create Patron B
    3) Attempt to set Patron A to be the guarantor for Patron B
    4) Note selecting the patron does nothing
    5) Apply this patch
    6) Repeat step 3
    7) Selecting the guarantor now works!
    
    Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9cd9240c362336e390eed01acf3630f33e73825f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit f2a828d5519fb346d6e4d768f80e1ebe3f2ead46
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Sun Nov 26 12:55:27 2017 -0300

    Bug 19655: Add tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 6a4b36bc3a186adb07679c2a3549e69974e02c18)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 Koha/Template/Plugin/To.pm                         |    2 +
 .../Template/Plugin/To.t}                          |   55 ++++++++++----------
 2 files changed, 30 insertions(+), 27 deletions(-)
 copy t/{Makefile.t => db_dependent/Template/Plugin/To.t} (54%)


hooks/post-receive
-- 
main Koha release repository