[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.04-34-g12afc7b

Fri Mar 13 02:42:11 CET 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, 3.18.x has been updated
       via  12afc7baea7beef6ac2a98b271aafd5e07ab6b4f (commit)
       via  7caaaff9268b3f6d2ef83e537c9858e35628d73b (commit)
       via  cfab129501504b72569a0fc249e9c020de37076d (commit)
       via  536d55823155d9d2f7dcb37bc063f2638eed0f3b (commit)
      from  470270ece7f3339b28611dc7ad944783b7a0b892 (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 12afc7baea7beef6ac2a98b271aafd5e07ab6b4f
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Tue Mar 3 19:28:44 2015 -0500

    Bug 13787 - Clean up noisy opac-advsearch warnings

    While testing bug 10937, there were noisy warnings, which
    distracted from testing the functionality of it.

    Here is a snippet of the after the patch warnings:
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 384.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 161.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 161.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 177.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 177.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 202.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 202.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 240.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 240.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 256.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 256.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 356.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 356.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 369.
    Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 369.

    Tweaking the [% IF %] statements eliminated the warnings.

    TEST PLAN
    ---------
    1) Apply patch
    2) Run koha qa test tools.
       -- there will be noisy warnings in the before processing, but
          there will be no such messages in the after processing.
    3) git diff origin/master
       -- there should be no visible typos.

    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    - Applied the patch from bug 10937
    - Ran "koha-qa.pl -c 1" and observed the warnings described in the
      commit message
    - Applied the patch from this bug
    - Ran "koha-qa.pl -c 1" again and saw no warnings
    - Ran "koha-qa.pl -c 2" and saw no warnings

    I have not tested the functionality of 10937 with this patch, just verified
    that the changes look sensible.

    This patch feels more like a followup for 10937, than a separate patch,
    especially since 10937 is just "signed off" at this time. But as long as it
    works...

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit f71f1ba6e23b7b3777ba2ea5d531bc2cf25da140)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 7caaaff9268b3f6d2ef83e537c9858e35628d73b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sat Feb 21 20:40:31 2015 +0100

    Bug 13744: Fix datatables paging on 'Holds to pull' report

    The paging of the datatables on the 'holds to pull' report
    page is broken without this patch.

    To test:
    - Make sure that some holds are placed on available items
      in your installation
    - Go to the circulation start page
    - Open the 'holds to pull' report
    - Verify that the patch fixes the paging on the result table

    Also: Fixes "None" in the filter pull downs to be translatable.
    Signed-off-by: Nicole <nicole at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit dad48bcf0a7e495fe68eab37198e2c40cdbe52bf)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit cfab129501504b72569a0fc249e9c020de37076d
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Feb 22 11:10:59 2015 +0100

    Bug 13744: Fix datatables paging on 'checkout history' page

    The paging in the datatable on the 'circulation history' page
    is broken without this patch.

    /cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=...

    To test:
    - Search for a record with items that have been checked out
      in the past
    - From the detail page, open the 'checkout history' tab
    - Check paging displays correctly with this patch and is
      broken without

    Signed-off-by: Nicole <nicole at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 92656844d89c37447947cdeaec1361a9ddadbdce)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 536d55823155d9d2f7dcb37bc063f2638eed0f3b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sat Feb 21 20:30:07 2015 +0100

    Bug 13744: Fix datatables paging on 'order from subscription' page

    The paging of the datatable on the 'order from subscription' page
    is broken without this patch.

    To test:
    - Make sure you have a subscription, note the vendor
    - Create a new basket for this vendor
    - Add a new order line 'from a subscription'
    - Check paging on the result table displays correctly

    Signed-off-by: Nicole <nicole at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit d9d0ea3904d4aa3b7498a3c0f4516bd497b59f8b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../prog/en/modules/acqui/newordersubscription.tt  |    3 ++-
 .../prog/en/modules/catalogue/issuehistory.tt      |    3 ++-
 .../prog/en/modules/circ/pendingreserves.tt        |    5 +++--
 .../bootstrap/en/modules/opac-advsearch.tt         |   23 +++++++++++++-------
 4 files changed, 22 insertions(+), 12 deletions(-)

hooks/post-receive
-- 
main Koha release repository