[koha-commits] main Koha release repository branch master updated. v3.20.00-422-ga6539ea

Fri Aug 21 15:21:03 CEST 2015

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  a6539ea73d87fbfcd0343ec17e705e198ac24b93 (commit)
       via  9eee8b90d72bf8d0bcbd10fe214b29518895798a (commit)
       via  183169fe8fe7e6c2ba5f786982f993328ebb527d (commit)
       via  c6d24b15ce4de1983fa1ccd6cb00d9131b195a62 (commit)
       via  a1359d8b8308e42a0f6bbede4c7c932875f6d037 (commit)
       via  b1eb5f2e444a0923cf9c19e3f8829abdb142ac2c (commit)
       via  44ef5c65a898fe8b5d71928b4fa0279d1f740728 (commit)
       via  4ce29452ad4839b6672126204ee867b10c28ca61 (commit)
       via  bb6277ffcc593685554112d770ac273c9efeda33 (commit)
      from  3cbed1e65e7fb62ef8460ba64b810b4038e6d70e (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 a6539ea73d87fbfcd0343ec17e705e198ac24b93
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Jul 22 14:19:09 2015 +0200

    Bug 14588: Simplify merge_ajax.pl

    This script does not need a few modules:
        IO::File; CGI::Session; C4::UploadedFile.
    Warnings can be enabled (with Modern::Perl).
    Indirect object syntax replaced for CGI and CGI::Cookie.
    Moved the $reply line upwards (not needed twice anymore).

    Test plan:
    [1] Log in as staff user. Run the URL cataloguing/merge_ajax.pl.
        You should see the JSON reponse in the browser.
    [2] Logout. Run the URL again. Blank screen.
    [3] Go to addbooks.pl (Cataloging Search). Search something, select two
        biblios and click Merge selected, etc.

    Signed-off-by: Joonas Kylmala <j.kylmala at gmail.com>

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 9eee8b90d72bf8d0bcbd10fe214b29518895798a
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Apr 21 10:34:52 2015 +1000

    Bug 14031: Itemnumber should be a numeric search in ccl.properties

    This patch changes the "itemnumber" alias so that it acts like
    "itemnumber,st-numeric". That is, it always does a numeric search.

    _TEST PLAN_

    The best way to test this patch is to apply the patch and then run
    "make upgrade", I suspect. As this will refresh your "ccl.properties".

    However, this patch is actually really small, so you can just apply
    it manually to an existing "ccl.properties" if you rather save time.

    Basically, you just need to do the following steps:

    0) Do a search for "itemnumber:<insert real indexed itemnumber here>"
    1) Note that you can't retrieve any results
    2) Change your ccl.properties to say "itemnumber 1=8010 4=109"
    3) Repeat the search for "itemnumber:<X>"
    4) Note that you now retrieve your result

    Signed-off-by: Magnus Enger <magnus at libriotech.no>
    Tested on a gitified package install. Made the change to
    /etc/koha/zebradb/ccl.properties manually. After this change
    I can successfully search for "itemnumber:1".

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 183169fe8fe7e6c2ba5f786982f993328ebb527d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 19 08:45:00 2015 +0100

    Bug 14652: Change one more occurrence of N/A.

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit c6d24b15ce4de1983fa1ccd6cb00d9131b195a62
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Thu Aug 6 11:03:43 2015 +1200

    Bug 14652: change gender specification from "N/A" to "None specified"

    To test:

    Edit a patron in the intranet, note that the gender options are "Female," "Male," and "None specified"

    Setting "None specified" should result in the gender not being shown on the patron detail page (unchanged functionality)

    In the opac, log in and click the "your personal details" tab, and note that the gender options are "Female," "Male," and "None specified"

    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit a1359d8b8308e42a0f6bbede4c7c932875f6d037
Author: Winona Salesky <wsalesky at gmail.com>
Date:   Tue Apr 28 22:11:57 2015 -0400

    Bug 13734: RDA: Display 33xs

        Test Plan:
        1) Apply this patch
        2) Ensure you are using the default XSLT setting for the staff and opac search results and record details
        3) Find or create a record with MARC tags 336,337,338
        4) Perform an opac search that would show the record in the search results.
        5) Click title to review record.
        6) Adds fields 336, 337 and 338 to staff and opac details. Adds comma between multiple subfields and | with class='separator' between multiple datafields (e.g. two 336 fields)
        7) Repeat steps 4 - 6 for the staff interface

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Works, no errors

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit b1eb5f2e444a0923cf9c19e3f8829abdb142ac2c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Aug 7 08:39:19 2015 -0700

    Bug 14661: space needed in added to staff side cart message, if items added are already in cart

    There is a missing space in the "added to cart" message on the staff side, when you are adding 2 or more items to the cart, where 1+ is already in the cart and 1+ is not in the cart. I verified that this is not an issue in the OPAC cart function.

    Test:

    1. Search for records in your system.
    2. In search results, select the first two records and choose Add to Cart.
    3. Message returned, "2 item(s) added to your cart", as expected.
    4. Keep those 2 records selected, and select 2 additional records (so 4 total records selected), and choose Add to Cart again.
    5. Message returned, "2 item(s) added to your cart2 already in your cart".
    6. Apply this patch
    7. Repeat steps 1 through 4
    8. Note the two phrases are on separate lines

    Signed-off-by: Heather Braum <hbraum at nekls.org>
    Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 44ef5c65a898fe8b5d71928b4fa0279d1f740728
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Fri Aug 21 09:47:08 2015 -0300

    Bug 6874: (QA followup) fix templates

    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 4ce29452ad4839b6672126204ee867b10c28ca61
Author: Jesse Weaver <pianohacker at gmail.com>
Date:   Tue Jul 7 13:02:18 2015 -0600

    Bug 14464: (QA followup) add unit tests

    This followup adds several tests to t/db_dependent/Reserves.t.

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit bb6277ffcc593685554112d770ac273c9efeda33
Author: Jesse Weaver <pianohacker at gmail.com>
Date:   Tue Jun 9 16:22:05 2015 -0600

    Bug 14464: Add ability to cancel waiting holds from checkin screen

    Test plan:

        1. Ensure that ExpireReservesMaxPickUpDelayCharge is set to 0.
        2. Place a hold (doesn't matter whether it's a bib/item-level hold),
           then confirm the hold by checking it in.
        3. Check in the item again, and hit Cancel.
        4. The reserve in question should be cancelled.
        5. Repeat steps 2-4 twice, once after setting
           ExpireReservesMaxPickUpDelayCharge to a nonzero value and again
           after clicking the "Forgive fees for manually expired holds"
           checkbox.

    A fine should only be applied when the syspref is enabled and the
    checkbox is not checked. Also, the checkbox should only appear after
    enabling the syspref. And finally, the checkbox should remember whether
    it is checked across multiple checkins, same as the "Forgive overdue
    charges" and "Book drop mode" checkboxes.

    Signed-off-by: Jason Burds <jburds at dubuque.lib.ia.us>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Amended patch: Removed 2 debugging lines.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 C4/Reserves.pm                                     |   23 +++---
 cataloguing/merge_ajax.pl                          |   22 +++---
 circ/returns.pl                                    |   19 ++++-
 etc/zebradb/ccl.properties                         |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/basket.js       |    1 +
 .../en/modules/cataloguing/value_builder/upload.tt |    2 +-
 .../value_builder/upload_delete_file.tt            |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   30 ++++++++
 .../prog/en/modules/members/memberentrygen.tt      |    6 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   41 ++++++++++
 .../bootstrap/en/modules/opac-memberentry.tt       |    2 +-
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    |   43 +++++++++++
 t/db_dependent/Reserves.t                          |   81 +++++++++++++++++++-
 13 files changed, 239 insertions(+), 35 deletions(-)

hooks/post-receive
-- 
main Koha release repository