[koha-commits] main Koha release repository branch master updated. v16.05.00-273-g46b7d5e
Git repo owner
gitmaster at git.koha-community.org
Fri Jul 8 15:39:40 CEST 2016
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 46b7d5e4c66d5eff732187dd25c5d3bc79305c8b (commit)
via ffc4adcfb94d0932c159e1cb8af0a7903a1f728c (commit)
via da8123326ef82e35c3369b700c62f6747618eced (commit)
via 58501eb4d451ca73fc2cab50db4077cdb63ef625 (commit)
via 6a493842cf85e025aa215391b4ef4166e4491546 (commit)
from c19f342bb1a8eaae25db979e94dc23efa4bc8a26 (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 46b7d5e4c66d5eff732187dd25c5d3bc79305c8b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jul 8 13:36:32 2016 +0000
Bug 6906 - DBRev 16.06.00.008
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit ffc4adcfb94d0932c159e1cb8af0a7903a1f728c
Author: Alex Sassmannshausen <alex.sassmannshausen at ptfs-europe.com>
Date: Mon Jul 4 19:22:51 2016 +0200
Bug 6906: Follow coding guidelines in terminology.
* Koha/Patron.pm (wantsCheckPrevCheckout, doCheckPrevCheckout): Rename
to...
(wants_check_for_previous_checkout, do_check_for_previous_checkout):
...this.
* C4/Circulation.pm: Use new names.
* t/db_dependent/Patron/CheckPrevCheckout.t: Renamed to...
* t/db_dependent/Patron/Borrower_PrevCheckout.t: ...this.
Bug 6906: Fix POD reference to old method name.
* Koha/Patron.pm (wants_check_for_previous_checkout): Fix POD.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit da8123326ef82e35c3369b700c62f6747618eced
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Jun 12 11:42:48 2016 +0100
Bug 6906: Add the warning message to the batch checkout
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 58501eb4d451ca73fc2cab50db4077cdb63ef625
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Jun 12 11:41:41 2016 +0100
Bug 6906: Tests - Do not assume CPL exists
Since bug 14878, tests must create the data they need to pass and not
assume they exist.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 6a493842cf85e025aa215391b4ef4166e4491546
Author: Alex Sassmannshausen <alex.sassmannshausen at ptfs-europe.com>
Date: Fri Mar 11 15:00:01 2016 +0100
Bug 6906 - show 'Borrower has previously issued...
New feature: provide granular means to configure warnings about items
that have been issued to a particular borrower before, according to
their checkout history.
- Global syspref ('CheckPrevCheckout'), set to 'hardno' by default,
allows users to enable this feature library wide.
- Per patron category pref allows libraries to create overrides per
category, falling back on the global setting by default.
- Per patron pref allows switching the functionality on at the level
of patron. Fall-back to category settings by default.
* Koha/Patron (wantsCheckPrevCheckout, doCheckPrevCheckout): New
methods.
* C4/Circulation.pm (CanBookBeIssued): Introduce CheckPrevCheckout
check.
* admin/categories.pl: Pass along checkprevcheckout.
* koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt: Expose
CheckPrevCheckout per category setting.
* koha-tmpl/intranet-tmpl/prog/en/modules/preferences/patrons.pref:
Expose CheckPrevCheckout syspref.
* koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt:
Expose per patron CheckPrevCheckout preference.
* koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt: Expose
per patron CheckPrevCheckout preference.
* koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt: Add
'CHECKPREVCHECKOUT' confirmation message.
* installer/data/mysql/kohastructure.sql: Modify structure of
'categories', 'borrowers', 'oldborrowers'.
* installer/data/mysql/sysprefs.sql: Add 'CheckPrevCheckout'.
* installer/data/mysql/atomicupdate/checkPrevCheckout.sql: New file.
* t/db_dependent/Patron/CheckPrevCheckout.t: New file with unit tests.
Test plan:
- Apply patch.
- Run updatedatabase.
- Regenerate Koha Schema files.
- Run the unit tests.
- Verify 'CheckPrevCheckout' is visible in Patrons sysprefs and can be
switched to 'hardyes', 'softyes', 'softno' and 'hardno'.
+ Check out previously checked out items to a patron, checking the
message appears as expected.
- Verify no 'Check previous checkouts' setting appears on the borrower
category pages if the syspref is set to a 'hard' option.
- Verify 'Check previous checkouts' setting appears on the borrower
category pages and can be modified per borrower category.
+ Issue previously issued items to a borrower, checking the message
appears as expected (This setting should override the default
setting if that is set to a 'soft' option).
- Verify no 'Check previous checkouts' setting appears on the individual
borrower pages if the syspref is set to a 'hard' option.
- Verify 'Check previous checkouts' setting appears on individual
borrower pages and can be modified.
+ Issue previously issued items to a borrower, checking the message
appears as expected (This setting should override the category
setting and the default setting if the latter is set to a 'soft'
option).
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: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 8 +
Koha.pm | 2 +-
Koha/Patron.pm | 76 +++-
Koha/Schema/Result/Borrower.pm | 18 +-
Koha/Schema/Result/Category.pm | 18 +-
Koha/Schema/Result/Deletedborrower.pm | 18 +-
admin/categories.pl | 3 +
installer/data/mysql/kohastructure.sql | 3 +
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 26 ++
.../prog/en/modules/admin/categories.tt | 53 +++
.../prog/en/modules/admin/preferences/patrons.pref | 9 +
.../prog/en/modules/circ/circulation.tt | 4 +
.../en/modules/circ/circulation_batch_checkouts.tt | 4 +
.../prog/en/modules/members/memberentrygen.tt | 21 +-
.../prog/en/modules/members/moremember.tt | 11 +
t/db_dependent/Patron/Borrower_PrevCheckout.t | 448 ++++++++++++++++++++
17 files changed, 714 insertions(+), 9 deletions(-)
create mode 100644 t/db_dependent/Patron/Borrower_PrevCheckout.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list