[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-25-gd68bb6b

Tue Jun 4 17:44:06 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  d68bb6b8c03c1d538b29448b5baf0dfb13cca736 (commit)
       via  85536020599855d6ae89aa1d66e05adc1c705f0e (commit)
       via  cf96dd5f53eea3b585ea8a38b916a30b89c24bea (commit)
      from  cfdf4759dc0fe857b3dfb2fcab2868e117c5e6ff (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 d68bb6b8c03c1d538b29448b5baf0dfb13cca736
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon May 20 10:12:44 2013 -0700

    bug 10292: improve fallback logic for picking XSLT

    This patch fixes a bug whereby XSLT files from the
    prog theme would be used (for English OPACs and staff
    interfaces) even if the user had created and enabled a
    custom theme that provided override XSLT files.

    This patch provides a clearer implementation of the fallback
    logic and adds test cases.

    To reproduce the bug:

    [1] Set OPACXSLTDetailsDisplay to 'default' and English as the OPAC
        language.
    [2] Create a new OPAC theme, including copying the XSLT files.
    [3] Set opactheme to the new theme.
    [4] Make a change to koha-tmpl/opac-tmpl/NEWTHEME/en/xslt/MARC21slim2OPACDetail.xsl
    [5] View a bib record in the OPAC. The change made in the previous step
        is not reflected.

    To test after applying the patch:

    [6] Reload the bib record in the OPAC. The change made in step 4 should
        now be reflected.
    [7] (To be thorough) Go through the test plan for bug 8947
        and verify that there is no regression.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit b0eeb00d48892c2ea7f42d787dae10364537ed6f)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 85536020599855d6ae89aa1d66e05adc1c705f0e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu May 16 14:02:24 2013 -0400

    Bug 10262 - fine calculation at checkin not respecting CircControl

    The fines.pl script uses the system preference CircControl to decide
    what branches circ rules to use for fine generation.

    Recently, code was added to the returns system to recalculate the fine
    at checkin time ( to support hourly loans ). The problem is that this
    code does not respect CircControl.

    Test Plan:
    1) Set circ control to "the library you are logged in at"
    2) Set different fines rules for two different librarys
    3) Check an item out at library A, backdate the due date so it's overdue
       and will have fines.
    4) Check the item in at library B
    5) Observe that the fines should be generated based on library A's rules,
       but the fines will be based on library B's rules instead!
    5) Apply the patch
    6) Repeat steps 3 and 4.
    7) Observe now that the fines should reflect the fines rules for Library A

    Note: it seems counter-intuitive for the fines system to behave this way
    based on the preference being set to "the library you are logged in at"
    but it does make sense. The rules used are from "the library you are
    logged in at" when the item is first checked out.

    If the fines system really did use the rules for the library the item was
    returned to, it would be easy to exploit the library system. Some Koha
    using systems have branches that charge fines, and others that don't, so
    a patron could just return any overdue items to a non-charging branch
    to avoid ever paying fines!

    Furthermore, it would mean that the fines.pl script would be using one
    set of rules to charge fines, and the returns system could possibly be
    using another. Since fines.pl has been around far longer, it makes sense
    to assume the fines.pl behavior is canonical.

    Signed-off-by: Mickey Coalwell <mcoalwell at nekls.org>
    Signed-off-by: George Williams <georgew at latahlibrary.org>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

    Merged with reservations; see comment on bug report for details.

    (cherry picked from commit 040eb4016f4b01d44f87ab6aca515c6917f73479)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit cf96dd5f53eea3b585ea8a38b916a30b89c24bea
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon May 13 15:07:34 2013 -0400

    Bug 10218 - In OPAC XSLT search results, add class to 'online access'

    In some cases in OPAC search results and the detail page there is a
    class specific to each line of data being output (publisher, date,
    subjects, etc). In other cases there is no additional class. This patch
    makes modifications to a few different OPAC files in an attempt to make
    them consistent with each other.

    To test, apply the patch and view:

    - an OPAC detail page with OPACXSLTDetailsDisplay off
    - the OPAC search results page with OPACXSLTDetailsDisplay off
    - the OPAC search results page with OPACXSLTDetailsDisplay on

    Labels should have classes relevant to their data. To test the specific
    case requested by this bug, view details/results for a record which
    includes online resources (856u in MARC21).

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

    html changes only, passes all tests

    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 45168efeb9a2c6e3268e2f002ca31af8e5e6afc8)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 C4/Circulation.pm                                  |   37 ++++++++++++++------
 C4/XSLT.pm                                         |   25 +++++++++++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   36 +++++++++---------
 .../opac-tmpl/prog/en/modules/opac-results.tt      |   10 +++---
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |   18 +++++-----
 t/XSLT.t                                           |   37 +++++++++++++++++++-
 6 files changed, 115 insertions(+), 48 deletions(-)

hooks/post-receive
-- 
main Koha release repository