[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-83-gc806cc8

Mon Sep 16 15:40:32 CEST 2013

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.12.x has been updated
       via  c806cc8e1998bd9c134f9839f7975d1fffbceef3 (commit)
       via  21d119735b1eda634b4ca4760da247b960ae0c9c (commit)
       via  534aa49297dc3dc1b9ab698743be1ce55eb0965f (commit)
       via  c0fbaa876c376f1e0d4d0f00d24103bf5f73a21f (commit)
      from  319efaf0957c7b7e3d2a7bae3964397e60d9a37f (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 c806cc8e1998bd9c134f9839f7975d1fffbceef3
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date:   Wed Aug 14 15:51:10 2013 +0200

    Bug 10727: Replace carriage return with <br /> when printing hold notices

    This patch replaces carriage return with <br /> in the content of
    hold notices for printing. This is necessary to convert html file
    into well formatted pdf file.

    Test plan :
      - check in an item reserved by a borrower
        that has not activated email notification
      - verify in message_queue table that you've got a
        new HOLD_PRINT notice with status 'pending'
      - run gather_print_notices.pl <directory>

    Without the patch, the script generates a html file without <br /> tags.
    If you run printoverdues.sh <directory>, the text in the resulting PDF
    file is all on one line

    With the patch, the script generates a html file with <br/> tags and
    the PDF file created by printoverdues.sh is well formatted.

    Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 30b32d99381a8296e41e6843c440cd9e3594eb8a)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 21d119735b1eda634b4ca4760da247b960ae0c9c
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Aug 20 17:18:13 2013 +0000

    Bug 10656: (follow-up) handle OPAC sorting of authvals where lib_opac is NULL

    The OPAC description for an authorized value is not required to be
    populated.  In particular, if it is NULL, the staff description is
    displayed instead.

    This patch makes sure that the sort order (in OPAC mode) uses either
    the staff description or the OPAC description as needed for each
    value.

    To test:

    [1] Make sure that AdvancedSearchTypes includes "ccode"
    [1] Arrange your CCODE values so the sort order for staff labels
        is different from the sort order for OPAC descriptions.  Also,
        ensure that one of the OPAC descriptions is NULL.  For example,

        authorised_value | lib     | lib_opac
        --------------------------------------
        ZZZ              | A_STAFF | Z_PUBLIC
        DDD              | D_STAFF | NULL
        AAA              | Z_STAFF | A_PUBLIC

    [2] Prior to the patch, any CCODE values where the OPAC description
        is NULL will sort first in the OPAC advanced search page, even
        if the displayed label shouldn't come first.
    [3] Apply the patch.
    [4] Verify that the collection list on the OPAC advanced search page
        is now correct.
    [5] Verify that the sort order on the staff advanced search page
        has not changed.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works nicely, tested in staff and OPAC.

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 0c67e94c8b8dbe1912fd5ba4b503cf53789b75a5)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 534aa49297dc3dc1b9ab698743be1ce55eb0965f
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Aug 1 09:14:08 2013 -0400

    Bug 10656: improve sorting of shelving location and collections on OPAC advanced search form

    Collection codes and shelving locations are displayed in the OPAC and
    staff client via GetAuthorisedValues which currently sorts results by
    "lib, lib_opac." Consequently if lib (the description for the staff
    client) doesn't match lib_opac (the description for the OPAC) sorting
    will appear to be nonsensical in the OPAC. GetAuthorisedValues can be
    passed an $opac parameter, so this should be used to switch how reuslts
    are sorted. This patch implements such a switch.

    To test, modify your collection code or shelving location authorized
    values so that lib and lib_opac do not match. Set your
    AdvancedSearchTypes system preference to display the modified authorized
    values and view the advanced search page in the OPAC and staff client.
    Sorting should be correct in each case according to the correct value
    (lib in the staff client, lib_opac in the OPAC).

    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Tested in staff and opac and it works perfectly!

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit dd13998837ebd28b3b97e28da470ec341251b9b2)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit c0fbaa876c376f1e0d4d0f00d24103bf5f73a21f
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Aug 20 16:59:06 2013 +0000

    Bug 10656: add regression test

    This patch adds regression tests to verify the sort
    order when fetching authorised values in either staff
    or OPAC mode.

    This patch also wraps the Koha.t tests in a transaction, and
    better handles skipping tests if Test::Deep is not installed.

    To test:

    [1] Verify that prove -v t/db_dependent/Koha.t passes

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Tests pass with all patches applied.

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit f8484348d12bac3b1e5f3d2e4fef9d3034d58969)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 C4/Koha.pm                            |    6 ++-
 misc/cronjobs/gather_print_notices.pl |    8 +++
 t/db_dependent/Koha.t                 |   86 +++++++++++++++++++++++++++++++-
 3 files changed, 96 insertions(+), 4 deletions(-)

hooks/post-receive
-- 
main Koha release repository