[koha-commits] main Koha release repository branch master updated. v3.16.00-1002-g4f4eb98

Git repo owner gitmaster at git.koha-community.org
Tue Nov 11 13:53:01 CET 2014


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  4f4eb9852387a016d8a04f9c5b37f7ffc711da2e (commit)
       via  7767f2e53b101bbd3b19e3fb0913833a6895fe66 (commit)
       via  ae7d5fd11b2ed75e2fae120ec0499e3abc966c78 (commit)
       via  c0aa0f5529825724e654fa7ccaae2b3e98c95cd0 (commit)
       via  9b67b0cd277912f9ccb0dea54765c5ebe5e2cf22 (commit)
       via  f37bb4ed499e94cb6d8e1c50a09c0e7ac6cc742a (commit)
       via  40ece625bba3ac1733bef69ac33871d16aa5834a (commit)
       via  561b474bc98e6c60d808ccdcb68a96c9c817dc48 (commit)
       via  88cccca185ac1a4242b93bf0704429743aa71b91 (commit)
      from  aa37fbfd53b45ff285a2cffee8d7110aaa824cfa (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 4f4eb9852387a016d8a04f9c5b37f7ffc711da2e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Oct 31 09:18:27 2014 -0400

    Bug 13113 [QA Followup] - Fix unit test
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 7767f2e53b101bbd3b19e3fb0913833a6895fe66
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date:   Mon Oct 20 15:37:17 2014 +0300

    Bug 13113 - Prevent juvenile/children from reserving ageRestricted material
    
    There is no reason for underage borrowers to reserve ageRestricted material and
    then be denied it's check-out due to ageRestriction.
    
    This patch prevents reserving material for borrowers not suitably aged.
    
     # # # # # #
     # A PRIORI #
     # # # # # #
    BOTH THE STAFF CLIENT AND THE OPAC
    1. Find a Record with Items, update the MARC Subfield 521a to "PEGI 16".
    2. Get a Borrower who is younger than 16 years.
    3. Place a hold for the underage Borrower for the ageRestricted Record.
    4. You can reserve an ageRestricted Record with ease.
    STAFF CLIENT ONLY
    5. Check-in an Item from the ageRestricted Record and catch the reservation.
    6. Check-out the ageRestricted Item for this underage Borrower.
    7. You get a notification about being unable to check-out due to age restriction.
       How lame is that for a 12 year old?
    
     # # # # # # # #
     # A POSTERIORI #
     # # # # # # # #
    STAFF CLIENT
    1. Find a Record with Items, update the MARC Subfield 521a to "PEGI 16".
    2. Get a Borrower who is younger than 16 years.
    3. Check-out an ageRestricted Item for this underage Borrower.
    4. You get a notification about having the maximum amount of reserves.
    5. Place a hold for the underage Borrower for the ageRestricted Record.
    6. You get a notification, that placing a hold on ageRestricted material is
       forbidden.
    
    Includes Unit tests.
    
    Followed test plan. Patch behaves as expected. (Note: Propagating error messages to template will be handled in Bug 13116 or 11999)
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit ae7d5fd11b2ed75e2fae120ec0499e3abc966c78
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date:   Fri Oct 17 17:23:21 2014 +0300

    Bug 13106 - Encapsulate Circulation::GetAgeRestriction() and modify it to check borrowers age as well.
    
    This patch moves the logic of deciding whether or not a borrower is old enough to access this material
    to its own function GetAgeRestriction.
    
    This makes it easier to use AgeRestriction elsewhere, like with placing holds.
    
    This feature adds a new function C4::Members::SetAge() to make testing ages a lot easier.
    A ton of Unit tests included.
    
    C4::Circulate::CanBookBeIssued() fixed and issue with undefined $daysToAgeRestriction per Marc Véron's
    suggestion.
    
    Test plan:
    (See comment #10 for screenshots about using age restriction)
    
    1) Without patch
    
    Configure Age Restricition (see Syspref AgeRestrictionMarker) and have a biblio record with e.g. PEGI 99 in age restriction field
    Try to check out to a patron with age < 99
    Check out should be blocked
    Change entry in age restriction field to PEGI99
    Check out schould now be blocked
    
    2) With patch
    Try checkouts again, behaviour should be th same.
    
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit c0aa0f5529825724e654fa7ccaae2b3e98c95cd0
Author: Marc Véron <veron at veron.ch>
Date:   Fri Oct 31 07:19:32 2014 +0100

    Bug 13176 - Add links "My account" and "My checkouts" for logged in user to drop down in staff client header
    
    This patch adds links to "My account" and "My checkouts" to drop down in staff client header.
    
    To test:
    Apply patch
    Got to drop down of logged in user (top right)
    See new links to "My account" and "My checkout" (above "Log out")
    Test the links.
    
    Signed-off-by: Magnus Enger <digitalutvikling at gmail.com>
    Works as advertised. The options are not displayed when you are logged
    in as the db/admin user.
    
    Added classes "toplinks-myaccount" and "toplink-mycheckouts" to li tags to make it possible to hide them (per Kyle M $
    Switching back to "Signd-off" (Hope this is OK becuause it is a tiny string addition)
    
    Marc
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 9b67b0cd277912f9ccb0dea54765c5ebe5e2cf22
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Oct 2 15:51:57 2014 +0200

    Bug 12987: The new format_price include file should be include on using datatables
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit f37bb4ed499e94cb6d8e1c50a09c0e7ac6cc742a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Sep 24 17:16:01 2014 +0200

    Bug 12987: Update table footer with the visible rows
    
    This patch is the preparation step for others.
    
    On acqui/acqui-home.pl and admin/aqbudgets.pl, it will be possible to
    see the totals in the footer updated with the filtered rows.
    
    Test plan:
    This cannot be tested alone, you have to apply it with others (see the
    "Blocked" bug reports).
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 40ece625bba3ac1733bef69ac33871d16aa5834a
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date:   Wed Oct 1 14:16:48 2014 +0200

    Bug 13018 : Static fine should be charged only once
    
    Test plan (see Bug 6858 for using staticfine.pl) :
    
    For a user (of a given category and library) with several overdues, launch the script :
    
    staticfines.pl --category CAT,AMOUNT --library LIB --delay DELAY
    
    Then, check that the user has been charged of AMOUNT if the due date of the most late item plus the delay is *before* today.
    
    One day later, re-execute the script with the same parameters and check that the fine has not been charged twice.
    
    Without patch, the fine is charged twice, with patch the user already charged is skipped (see output in debug mode)
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Without the patch, the fine will be applied every time the script is run.
    With the patch the fine will only be applied once.
    Passes tests and QA script.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 561b474bc98e6c60d808ccdcb68a96c9c817dc48
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Mon Nov 10 23:59:36 2014 -0300

    Bug 13230: t/Biblio.t should run without a DB
    
    This patch makes t/Biblio.t mock the DB connexion setting
    a void one. All tests in this file currently call the C4::Biblio
    functions with invalid (absent) parameters, so they are expected to
    raise warnings and return undef values.
    
    If someone writes mocked tests for the rest of the functionality,
    it is expected to mock the DB calls to match the desired scenario.
    
    To test:
    - Turn of MySQL
    - Run
      $ prove t/Biblio.t
    => FAIL: Tests fail because of missing MySQL server
    - Apply the patch
    - Run
      $ prove t/Biblio.t
    => SUCCESS: Tests now pass
    - Start MySQL
    - Run
      $ prove t/Biblio.t
    => SUCCESS: Tests still pass
    - Sign off
    
    Regards
    Tomas
    
    Sponsored-by: The will to procrastinate
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Sponsored-by: Wanting the darn packages to build
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Sponsored-by: Not wanting to read in my maths book
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 88cccca185ac1a4242b93bf0704429743aa71b91
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Tue Nov 11 15:13:50 2014 +1300

    Bug 12234 - dependency updates for master
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 C4/Auth.pm                                         |    1 +
 C4/Circulation.pm                                  |   68 ++++++++++------
 C4/Members.pm                                      |   43 ++++++++++
 C4/Overdues.pm                                     |   11 ++-
 C4/Reserves.pm                                     |    8 +-
 debian/control                                     |    2 +
 .../intranet-tmpl/prog/en/includes/datatables.inc  |    1 +
 .../prog/en/includes/format_price.inc              |   27 +++++++
 .../intranet-tmpl/prog/en/includes/header.inc      |    8 ++
 koha-tmpl/intranet-tmpl/prog/en/js/datatables.js   |   31 ++++++++
 misc/cronjobs/staticfines.pl                       |    2 +-
 t/Biblio.t                                         |   12 +++
 t/Circulation/AgeRestrictionMarkers.t              |   21 ++++-
 t/db_dependent/Members.t                           |   84 ++++++++++++++++++--
 t/db_dependent/Reserves.t                          |   37 ++++++++-
 15 files changed, 319 insertions(+), 37 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list