[koha-commits] main Koha release repository branch master updated. v16.05.00-800-g130733a

Git repo owner gitmaster at git.koha-community.org
Fri Sep 9 16:38:16 CEST 2016


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, master has been updated
       via  130733a0130d4cf2e522956165ee1d2c0557cceb (commit)
       via  1a3b92bc76c3db628d2ffcf6d086840952ad9283 (commit)
       via  dc4617ba3b57913123689b7bb9cf1342fcc7c84c (commit)
       via  36b9fa32b16d5928dd9a35b04ff2144b4f77f314 (commit)
      from  a9d3eb233bffab3b974e51f34adf502548341c3c (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 130733a0130d4cf2e522956165ee1d2c0557cceb
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Aug 16 14:20:36 2016 +0200

    Bug 17109: [QA Follow-up] Die when wrong token
    
    Removes template var csrf_error and associated handling.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Restested with opac and intranet: Still sends or dies elegantly..
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 1a3b92bc76c3db628d2ffcf6d086840952ad9283
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Aug 12 08:29:42 2016 +0200

    Bug 17109: Use Koha.Preference in sendbasket template
    
    No need to send OPACBaseURL to the template, if you load the Koha TT
    plugin inside the template.
    
    Test plan:
    Send a few items in your cart from OPAC and intranet.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit dc4617ba3b57913123689b7bb9cf1342fcc7c84c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 11 14:17:14 2016 +0200

    Bug 17109: Add CSRF token to [opac-]sendbasket
    
    If you have no (valid) token, you will not be able to send the message.
    
    Test plan:
    [1] Verify if you can still send the cart from opac and intranet.
    [2] While still being logged in, try to send the cart from opac by
        using the following URL:
        /cgi-bin/koha/opac-sendbasket.pl?email_add=you at somedomain.com&comment=csrf_test&bib_list=doesnotmatter&csrf_token=justsomeguess12345
        This should now result in a csrf error.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 36b9fa32b16d5928dd9a35b04ff2144b4f77f314
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 11 13:10:21 2016 +0200

    Bug 17109: Remove second authentication from (opac-)sendbasket
    
    Patch deals with opac and intranet variant.
    If we authenticated the first time, it is not necessary to do it
    a second time rightaway.
    
    Replaces a call to get_template_and_user (including checkauth) by
    gettemplate.
    
    Also removes duplicate use C4::Biblio statements.
    
    Test plan:
    [1] Put a few books in the cart.
    [2] Send the cart from OPAC.
    [3] Send the cart from intranet.
    
    Tested 3 patches together. Works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 basket/sendbasket.pl                               |   36 ++++++++++++--------
 .../prog/en/modules/basket/sendbasket.tt           |    6 ++--
 .../prog/en/modules/basket/sendbasketform.tt       |    9 ++---
 .../bootstrap/en/modules/opac-sendbasket.tt        |    6 ++--
 .../bootstrap/en/modules/opac-sendbasketform.tt    |    1 +
 opac/opac-sendbasket.pl                            |   34 +++++++++++-------
 6 files changed, 57 insertions(+), 35 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list