[koha-commits] main Koha release repository branch master updated. v3.20.00-537-g73e9dcb

Mon Sep 7 17:09:49 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  73e9dcb70fcf24dc87af7c5af6f38102206863ae (commit)
       via  ea92a92f5384c3256de55b770d31342f796edc47 (commit)
       via  40fc2a99c19de69feb8e10a49441d701c9e6e0e8 (commit)
       via  2afaddb592cdf0937dc0f2de3c80d65ee7f83ffb (commit)
       via  7587e7c752fc33788416e351e15154cf843fe18c (commit)
       via  e2a87c54c0c7d26d131e0bff147d6bab1bcaa792 (commit)
       via  48e3e1ab275c999acb9ec5150f27b22394642c5b (commit)
       via  44a4e043a5b9332595a58e4f9d9eb8f4eb8353c0 (commit)
      from  7f65aaac748833b57f9f1c8ae754d66c7e144d81 (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 73e9dcb70fcf24dc87af7c5af6f38102206863ae
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Mon Aug 31 09:36:02 2015 -0400

    Bug 14760: Disabled courses display in the course reserves list for items

    If an item is on reserve for two courses but one of those courses is
    disabled, both courses are still listed on opac-detail.pl!

    Test Plan:
    1) Enable course reserves
    2) Create two courses
    3) Place one item on reserve for both courses
    4) Disable one of the two courses
    5) View the record details for that record/item
    6) You should see both courses listed in the course reserves column
    7) Apply this patch
    8) Reload the page
    9) You should now only see the active course in the course reseves column

    Followed test plan. Works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>

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

commit ea92a92f5384c3256de55b770d31342f796edc47
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 4 10:38:29 2015 +0100

    Bug 14470: Do not allow renew for on-site checkouts

    At the opac, the renew checkbox should not be displayed if it's an
    on-site checkout (same on the intranet).

    On the way, this patch adds a specific message to the intranet if the
    librarian try to renew an on-site checkout.
    Indeed before this patch a renew was allowed if the barcode was scanned.

    Test plan:
    1/ Create an on-site checkout for a patron
    2/ Confirm that the checkbox 'renew' is not displayed on the checkout
    list tables
    3/ At the OPAC, the renew should not be allowed (no checkbox)
    4/ Try to check the item out to the same patron, confirm that you get a
    specifig message to inform you the renew is not allowed for on-site
    checkouts.

    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Changed 'issue' to 'item' in the error message.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 40fc2a99c19de69feb8e10a49441d701c9e6e0e8
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Thu Sep 3 10:13:18 2015 -0300

    Bug 14639: (QA followup) make schema mandatory

    This patch makes the 'schema' param mandatory. It is passed in every
    call on the current codebase, so it makes no harm now, but makes
    the code less error-prone.

    Tests for this situation are added to t/Koha_MetadataRecord.t (schema
    param is omitted and new() returns undef and a carped warning).

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 2afaddb592cdf0937dc0f2de3c80d65ee7f83ffb
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 3 11:41:23 2015 -0300

    Bug 14639: Extend Koha::MetadataRecord to handle serialization format and record id

    The description of this changes is on the regression tests commit
    message.

    To test:
    - Apply the test patch
    - Run
      $ prove t/Koha_MetadataRecord.t
    => FAIL: Tests fail because changes are not implemented
    - Apply this patch
    - Run
      $ prove t/Koha_MetadataRecord.t
    => SUCCESS: tests pass
    - Run
      $ prove t/Koha_Util_MARC.t
    => SUCCESS: it still passes
    - Sign off :-D

    NOTE: Tested as above. Read code. Seems to cover all cases.

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

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

commit 7587e7c752fc33788416e351e15154cf843fe18c
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 3 11:37:36 2015 -0300

    Bug 14639: (regression tests) Extend Koha::MetadataRecord to handle serialization format and record id

    In order to use Koha::MetadataRecord as a container for moving records
    around it is important to let it carry the serialization format
    of the record object it was built with, so it is easier and cheaper to
    make decisions about records.

    This patch introduces regression tests for the changes to be made.
    The 'format' param is introduced, and also sets default values:
      schema => 'marc21'
      format => 'MARC'

    A new (optional) 'id' param is added so the record carries its own id outside
    of it.

    The default behaviour is preserved, and no changes are needed in places
    Koha::MetadataRecord is used.
    ->new also returns undef if no record is passed, and raises a carped warning.

    To test:
    - Apply this test patch
    - Run the new tests
      $ prove t/Koha_MetadataRecord.t
    => FAIL: Tests shoud fail as the changes are not implemented on Koha::MetadataRecord

    Edit: made serialization format be upper-case to match what is used on Koha::Filter's

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

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

commit e2a87c54c0c7d26d131e0bff147d6bab1bcaa792
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Sep 1 15:39:16 2015 +0200

    Bug 14702: [QA Follow-up] More readable variable names, less queries

    The names are much better now :)
    Combined the queries for items and issues.
    Only check the number of holds when needed.

    Test plan:
    Verify the changes here by running the unit test again.

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 48e3e1ab275c999acb9ec5150f27b22394642c5b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Aug 21 13:00:11 2015 +0200

    Bug 14702: Unit tests for GetReserveFee and ChargeReservesFee

    Test plan:
    Run the test: t/db_dependent/Reserves/GetReserveFee.t

    Signed-off-by: Joonas Kylmala <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 theke.io>

commit 44a4e043a5b9332595a58e4f9d9eb8f4eb8353c0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Aug 21 11:44:55 2015 +0200

    Bug 14702: Refactor GetReserveFee

    The code of GetReserveFee was not very clear.
    What it did was: check if there are some items not issued. If so and there
    are no holds, calculate no fee.

    While doing so, I moved the code to charge the fee (in AddReserve) to a small
    new sub ChargeReserveFee.

    There is no change in behavior.
    The follow-up patch adds unit tests.

    Test plan:
    [1] Make sure that a patron category (X) includes a hold fee.
    [2] Select a biblio with 2 items.
    [3] Issue one item to another patron.
    [4] Place a hold on this biblio by patron with category X. No charge?
    [5] Cancel the hold from the previous step.
    [6] Use another patron to place another hold on this biblio.
    [7] Place hold again by patron with category X. Is it charged?
    [8] Cancel that hold again. Issue the second item to another patron.
    [9] Place hold again by patron with category X. Is it charged again?

    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 theke.io>

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

Summary of changes:
 C4/Circulation.pm                                  |    8 +-
 C4/Reserves.pm                                     |  142 +++++++-------------
 Koha/MetadataRecord.pm                             |   71 +++++++++-
 koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js    |   26 ++--
 .../prog/en/modules/circ/circulation.tt            |    4 +
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |   18 +--
 t/Koha_MetadataRecord.t                            |   64 ++++++++-
 t/db_dependent/Circulation.t                       |   38 +++++-
 t/db_dependent/Reserves/GetReserveFee.t            |  127 +++++++++++++++++
 9 files changed, 374 insertions(+), 124 deletions(-)
 create mode 100755 t/db_dependent/Reserves/GetReserveFee.t

hooks/post-receive
-- 
main Koha release repository