[koha-commits] main Koha release repository branch master updated. v3.14.00-alpha2-78-gda9c4ca
Git repo owner
gitmaster at git.koha-community.org
Thu Oct 31 02:45:52 CET 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, master has been updated
via da9c4cab1faaa17e95320c83e97b9063e6b8c553 (commit)
via 3c0d3b00b22510b8460a4737fe098599e2c15117 (commit)
via 6c632637e1c08aa0023e7b4032fd6b148c937c21 (commit)
via eff4815991e03e6b73bd29bd6385d9fc521bfcaf (commit)
via 965b2c7d58551cfd43fe064a58ebe9f9df2a332f (commit)
via d69247b381e1e5552cccff7de2e34138445376a2 (commit)
via 3804b177451abb64976466cdcc34dac6474b443b (commit)
via 69036971aee4a073c0ccd7210c1f6b7682ee58b2 (commit)
via 378ae7d0e6e2d6edc705bcf09e6ec793262dfb56 (commit)
via 0532bdc95616f80c24f935d1bb5875b2f5e267dd (commit)
via 80897930b73dcd17b377ce2d175a85a720117922 (commit)
from ea3b5aad217fa38d6f35738e9d049597bf1faa8a (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 da9c4cab1faaa17e95320c83e97b9063e6b8c553
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 31 01:52:14 2013 +0000
Bug 2720: (follow-up) fix error that prevented sysprefs from being loaded
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 3c0d3b00b22510b8460a4737fe098599e2c15117
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 31 01:31:29 2013 +0000
Bug 2720: (follow-up) update DBIx::Class schema classes
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 6c632637e1c08aa0023e7b4032fd6b148c937c21
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 31 01:29:28 2013 +0000
Bug 2720: (follow-up) add new table to kohastructure.sql
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit eff4815991e03e6b73bd29bd6385d9fc521bfcaf
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 31 01:28:09 2013 +0000
Bug 2720: (follow-up) add foreign key from new table to borrowers
Foreign keys should be added as a matter of course for new tables.
Argubably, borrower_debarments.manager_id could also be linked to
borrowers, but this patch does not do that.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 965b2c7d58551cfd43fe064a58ebe9f9df2a332f
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 31 01:01:18 2013 +0000
Bug 2720: DBRev 3.13.00.035
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit d69247b381e1e5552cccff7de2e34138445376a2
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Sep 24 12:32:16 2013 +0200
Bug 2720: (follow-up) fix the "remove" links
If there are more than one restriction, the "remove" links don't display
the JavaScript alert.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 3804b177451abb64976466cdcc34dac6474b443b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Sep 24 11:57:43 2013 +0200
Bug 2720: (follow-up) change license version to GPLv3+
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 69036971aee4a073c0ccd7210c1f6b7682ee58b2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Aug 27 13:04:38 2013 -0400
Bug 2720: (follow-up) improve readability of a template
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 378ae7d0e6e2d6edc705bcf09e6ec793262dfb56
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Jul 18 12:10:44 2013 +0200
Bug 2720: (follow-up) improve unit tests
Create the patron.
Use a transaction.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 0532bdc95616f80c24f935d1bb5875b2f5e267dd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jul 5 13:05:27 2013 -0400
Bug 2720: (follow-up) improve data entry form for manual restrictions
This follow-up to Bug 2720 makes some template changes which I think
make the interface a little more consistent and streamlined.
Instead of incorporating the manual entry form into the table it is
broken out and follows standard form structure. This lets the table be
hidden altogether if there are no existing restrictions.
The manual entry form is hidden by default and shown when you click a
link to add a manual restriction.
These changes have been applied to both the include file used for
circulation and patron detail and to the patron entry form template.
To test, add and remove manual restrictions from the circulation page,
the patron detail page, and the patron edit page. All operations should
work correctly.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 80897930b73dcd17b377ce2d175a85a720117922
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jan 29 09:34:13 2013 -0500
Bug 2720 - Overdues which debar automatically should undebar automatically when returned
This patch adds a more extensible and flexible debarments system to Koha. The fields
borrowers.debarred and borrowers.debarredcomment are retained for compatibility and
speed.
This system supports having debarments for multiple reasons. There are currently
three types of debarments:
OVERDUES - Generated by overdue_notices.pl if the notice should debar a patron
SUSPENSION - A punative debarment generated on checkin via an issuing rule
MANUAL - A debarment created manually by a librarian
OVERDUE debarments are cleared automatically when all overdue items have been returned,
if the new system preference AutoRemoveOverduesRestrictions is enabled. It is disabled
by default to retain current default functionality.
Whenever a borrowers debarments are modified, the system updates the borrowers debarment
fields with the highest expiration from all the borrowers debarments, and concatenates
the comments from the debarments together.
Test plan:
1) Apply patch
2) Run updatedatabase.pl
3) Verify the borrower_debarments table has been created and
populated with the pre-existing debarments
4) Run t/db_dependent/Borrower_Debarments.t
5) Manually debar a patron, with an expiration date
6) Verify the patron cannot be issued to
7) Add another manual debarment with a different expiration date
8) Verify the 'restricted' message lists the date farthest into the future
9) Add another manual debarment with no expiration date
10) Verify the borrower is now debarred indefinitely
11) Delete the indefinite debarment
12) Verify the debarment message lists an expiration date dagain
13) Enable the new system preference AutoRemoveOverduesRestrictions
14) Set an overdue notice to debar after 1 day of being overdue
15) Check out an item to a patron and backdate the due date to yesterday
16) Run overdue_notices.pl
17) Verify the OVERDUES debarment was created
18) Return the item
19) Verify the OVERDUES debarment was removed
20) Disable AutoRemoveOverduesRestrictions
21) Repeat steps 15 though 18, verify the OVERDUES debarment was *not* removed
22) Add issuing rules so that an overdue item causes a temporary debarment
23) Check out an item to a patron and backdate the due date by a year
24) Return the item
25) Verify the SUSPENSION debarment was added to the patron
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 37 ++-
C4/Members.pm | 42 +--
C4/Overdues.pm | 37 +--
Koha/Borrower/Debarments.pm | 333 ++++++++++++++++++++
Koha/Schema/Result/Borrower.pm | 19 +-
Koha/Schema/Result/BorrowerDebarment.pm | 144 +++++++++
circ/circulation.pl | 18 +-
installer/data/mysql/kohastructure.sql | 21 ++
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 31 ++
.../prog/en/includes/borrower_debarments.inc | 73 +++++
.../en/modules/admin/preferences/circulation.pref | 6 +
.../prog/en/modules/circ/circulation.tt | 24 +-
.../prog/en/modules/members/memberentrygen.tt | 88 ++++--
.../prog/en/modules/members/moremember.tt | 8 +-
.../prog/en/modules/tools/modborrowers.tt | 6 -
kohaversion.pl | 2 +-
members/memberentry.pl | 40 ++-
members/mod_debarment.pl | 63 ++++
members/moremember.pl | 6 +-
members/setdebar.pl | 50 ---
misc/cronjobs/overdue_notices.pl | 12 +-
opac/opac-reserve.pl | 2 +-
opac/opac-user.pl | 3 +-
t/db_dependent/Borrower_Debarments.t | 96 ++++++
tools/modborrowers.pl | 18 +-
26 files changed, 970 insertions(+), 210 deletions(-)
create mode 100644 Koha/Borrower/Debarments.pm
create mode 100644 Koha/Schema/Result/BorrowerDebarment.pm
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
create mode 100755 members/mod_debarment.pl
delete mode 100755 members/setdebar.pl
create mode 100755 t/db_dependent/Borrower_Debarments.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list