[koha-commits] main Koha release repository branch master updated. v3.22.00-824-gcf04868

Mon Mar 7 18:53:40 CET 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  cf04868450b0137f20d61396ab0d80990c9dcf53 (commit)
       via  01994e2c48ee15d750bdbce2dec87babb11dc8cb (commit)
       via  ffbb575061c278e7d494ecf9cabe5e6d1e22f2b1 (commit)
       via  caae161a4e64280ba9d8fbd0a5028a6818b3a2a6 (commit)
      from  6f25627519a080d90068719a010ed228372a6060 (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 cf04868450b0137f20d61396ab0d80990c9dcf53
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 27 10:01:53 2015 +0200

     Bug 14306: Remove call to GetMarcNotes from sendshelf

    Just as mentioned in the first patch for sendbasket, I discovered that
    the call of GetMarcNotes is not really used in sendshelf. The array is
    passed to the template, but the template does not use it. (It uses the
    information from GetBiblioData.)

    Test plan:
    [1] Send a list that includes a record with some notes (opac and staff).

    Signed-off-by: Marc Véron <veron at veron.ch>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

commit 01994e2c48ee15d750bdbce2dec87babb11dc8cb
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 27 09:49:40 2015 +0200

     Bug 14306: Changes for basket and detail templates

    A simple regex is added to the basket and detail templates to select the
    URLs passed separately from MARC21 555$u by GetMarcNotes. Note that the
    regex tests if a note starts with http:// or https:// and does not contain
    any whitespace in order to be considered as a url.
    These URLs are put in an anchor tag.

    This touches four places:
    [1] opac detail, tab title notes
    [2] catalogue detail, tab Descriptions
    [3] opac basket, more details, notes
    [4] staff basket, more details, notes

    Test plan:
    [1] Edit a record. Add a 500$a, 555$a and a URL in 555$u.
        Put "http://this is not a url" in the 500$a (whitespace!).
    [2] Check opac-detail, tab Title Notes. Check the URL.
    [3] Do the same for catalogue/detail.
    [4] Add record to cart in OPAC. Open basket. Check More details.
    [5] Repeat previous step in staff.

    Signed-off-by: Marc Véron <veron at veron.ch>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

commit ffbb575061c278e7d494ecf9cabe5e6d1e22f2b1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Aug 26 16:35:38 2015 +0200

     Bug 14306: Follow-up for URLs in 555$u

    This patch removes the code for inserting the <a> anchor tags around
    URLs in GetMarcNotes (as added originally).
    The URLs are placed in separate array elements; the template should take
    care of further handling.
    The unit test has been adjusted accordingly.

    Test plan:
    Run the unit test.

    Signed-off-by: Marc Véron <veron at veron.ch>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

commit caae161a4e64280ba9d8fbd0a5028a6818b3a2a6
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jun 1 12:58:25 2015 +0200

     Bug 14306: Show URL from MARC21 field 555$u under Title Notes/Descriptions

    This patch includes:
    [1] Add some logic to GetMarcNotes to embed the contents of MARC21 field
        555$u in a html anchor tag.
    [2] Add a unit test for GetMarcNotes in Biblio.t
    [3] Remove calls to GetMarcNotes from sendbasket.pl (opac and staff).
        A closer look revealed that the data was not used; the notes in the
        mail of sendbasket are taken from GetBiblioData.

    Test plan:
    [1] Edit a record. Add one or two URLS in 555$u. Add something in 500$a too.
    [2] Check if you can click the URLs in opac and staff detail tab Notes or
        Descriptions.
    [3] Run the unit test t/db../Biblio.t
    [4] Add something in the cart. Click More Details and send the cart.
        Verify that you have something in Notes (from 500$a).

    Signed-off-by: Marc Veron <veron at veron.ch>
    Followed test plan. Works as expected. QA tools OK.

    Tested with all patches together, works as expected
    Signed-off-by: Marc Véron <veron at veron.ch>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

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

Summary of changes:
 C4/Biblio.pm                                       |   47 ++++++++------------
 basket/sendbasket.pl                               |    2 -
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |   10 ++++-
 .../prog/en/modules/catalogue/detail.tt            |   12 +++--
 .../opac-tmpl/bootstrap/en/modules/opac-basket.tt  |   11 ++++-
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |    8 +++-
 opac/opac-sendbasket.pl                            |    2 -
 opac/opac-sendshelf.pl                             |    2 -
 t/db_dependent/Biblio.t                            |   18 +++++---
 virtualshelves/sendshelf.pl                        |    2 -
 10 files changed, 65 insertions(+), 49 deletions(-)

hooks/post-receive
-- 
main Koha release repository