[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.07-17-g157833b

[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, 18.11.x has been updated
       via  157833b7bcffde5d3a12e721cc49ffc5bb2a846e (commit)
       via  e73a82c8305fb2afa7c94e88a52eba906dd51b4d (commit)
      from  cb5767b79de9462946408c92b5791c16ef36674d (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 157833b7bcffde5d3a12e721cc49ffc5bb2a846e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jun 17 20:07:29 2019 -0500

    Bug 15814: Add missing filters
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 12a9dfb6593c4d5ccc6936b85c82479c12337309)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit c96cfdcb801a4dff276dd6cab53a4f3f4c2736b2)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit e73a82c8305fb2afa7c94e88a52eba906dd51b4d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed May 29 21:28:23 2019 -0500

    Bug 15814: Handle correctly MMTA edit button
    
    The MARC modification template action edit buton does not correctly
    handle variable escaping.
    Assigning a JS variable containing the JSON representation of the
    hashref will make the processing much more easier.
    
    Test plan:
    Create a MARC Modification Template with several actions.
    In the description you should use the following characters, to try to
    break this patch: \ ' " \n \r
    (not sure what we handled \n and \r)
    Then edit the action, modify and save again.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 7a80483a1358a7bc3e516a8fbc92d34b6559dcac)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 68424ae5adab4b8ab4b4f165b6c9ac72cf2590cc)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 .../modules/tools/marc_modification_templates.tt   |   24 ++-------
 .../prog/js/marc_modification_templates.js         |   53 +++++++++++---------
 2 files changed, 32 insertions(+), 45 deletions(-)


hooks/post-receive
-- 
main Koha release repository