[koha-commits] main Koha release repository branch master updated. v16.05.00-228-g0fda22b
Git repo owner
gitmaster at git.koha-community.org
Thu Jul 7 19:02:46 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 0fda22b824a2e7c13e9b633325748d422e98e2a3 (commit)
via 0bb144bbaf578ef7e4a131d640b3866bfe05fdf5 (commit)
via 1887b7ab3ea50f9721eba070bc156c7f268d966a (commit)
via c24fc83eee88771c36a0475165619c96fe54ebf2 (commit)
via e657345fd7493816f1713fd825fac1e1f2f757a7 (commit)
via 22f727f30e33227be449bef6d73861ae36b31ad5 (commit)
via 86e998cc418e01e115054c1da3912680b38847cf (commit)
via d4d550237a654257f0cf7932a74098cec11781f7 (commit)
via d8e186a7a932869c7d6766aa7d9c5066518d128d (commit)
via 523cdcee044c87dd886e3364f65fac5b2a2c294a (commit)
via b1b61c60735a4afaec48da2e199cf673942d2683 (commit)
via e85b2e4f94ccbcc62bbe516d6ce1fdab9e626cfa (commit)
via 262b9344cd395dd9209a0aabd457b63a0207523e (commit)
via 65558f20801dc7245de385af29fc7c650a8211f3 (commit)
from 4747e6155efc9902003ae3ae4c14535fc7ece015 (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 0fda22b824a2e7c13e9b633325748d422e98e2a3
Author: Jesse Weaver <jweaver at bywatersolutions.com>
Date: Thu Jul 7 11:02:53 2016 -0600
Bug 14048: (RM followup) DB version 16.06.00.006
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit 0bb144bbaf578ef7e4a131d640b3866bfe05fdf5
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jun 27 10:17:20 2016 -0300
Bug 14048: (QA followup) Default to 1 if no default rule
This patch answers Jonathan's request to simplify this patchset a bit.
It removes the need for the .sql file, as _default_rule now defaults to
a fixed value (1, which was set by the removed .sql file).
This allowed to remove the overloaded ->delete method.
The tests have been adjusted to reflect this changes, including tests for
the new 'default'-if-absent situation.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit 1887b7ab3ea50f9721eba070bc156c7f268d966a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Jun 26 08:19:12 2016 +0100
Bug 14048: Use mock_preference in tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit c24fc83eee88771c36a0475165619c96fe54ebf2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Jun 25 12:37:15 2016 -0300
Bug 14048: (QA folloup) C4::Context->preference should be used
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit e657345fd7493816f1713fd825fac1e1f2f757a7
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Jun 21 15:18:51 2016 -0300
Bug 14048: (followup) Use the original holding branch
This patch picks the item's holding branch *before* it gets fixed
by using the checkin library instead. This way the RefundLostOnReturnControl
syspref set to ItemHoldingBranch is respected (otherwise, as Nick explained
this behaves just like if CheckinLibrary was set)
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Margaret Thrasher <p.thrasher at dover.nh.gov>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit 22f727f30e33227be449bef6d73861ae36b31ad5
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 17 10:33:22 2016 -0300
Bug 14048: (QA followup) Fix typo on syspref value
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Margaret Thrasher <p.thrasher at dover.nh.gov>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit 86e998cc418e01e115054c1da3912680b38847cf
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jun 15 16:18:38 2016 -0300
Bug 14048: (QA followup) Update syspref name for HEA
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Margaret Thrasher <p.thrasher at dover.nh.gov>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit d4d550237a654257f0cf7932a74098cec11781f7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jun 13 11:17:42 2016 +0000
Bug 14048 [QA Followup] - Delete only the removed system preference
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Margaret Thrasher <p.thrasher at dover.nh.gov>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit d8e186a7a932869c7d6766aa7d9c5066518d128d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 3 11:24:07 2016 -0300
Bug 14048: Add syspref and atomic update
This patch introduces the changes to the sysprefs and the atomic update
that creates the new table.
It picks the syspref value for RefundLostItemFeeOnReturn and uses it to
create a default (branchcode='*') rule on the new table.
Sponsored-by: DoverNet
Sponsored-by: South-East Kansas Library System
Sponsored-by: SWITCH Library Consortium
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Margaret Thrasher <p.thrasher at dover.nh.gov>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit 523cdcee044c87dd886e3364f65fac5b2a2c294a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jun 9 16:48:07 2016 +0000
Bug 14048: [QA Followup]
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Margaret Thrasher <p.thrasher at dover.nh.gov>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit b1b61c60735a4afaec48da2e199cf673942d2683
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 3 11:26:42 2016 -0300
Bug 14048: Hook new rules into C4::Circulation
This patch makes AddIssue and AddReturn use the new implementation
The behaviour should respect the specification.
Sponsored-by: DoverNet
Sponsored-by: South-East Kansas Library System
Sponsored-by: SWITCH Library Consortium
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Margaret Thrasher <p.thrasher at dover.nh.gov>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit e85b2e4f94ccbcc62bbe516d6ce1fdab9e626cfa
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 3 11:26:11 2016 -0300
Bug 14048: Add a refund rules setting form in smart-rules
This patch introduces the CRUD UI for managing the refund lost item fee
rules on the general 'Circulation and fines rules' page.
Verify that rules can be added and changed.
Rules are correctly associated to the chosen branch (or the
general default rule).
To test:
- Apply the patch
- Open smart-rules.pl
=> SUCCESS: The text and refund rules section correctly refers to default global rules.
The policy can be set to Yes and No, and works as expected.
- Pick a specific branch
=> SUCCESS: The rule refers to the specific branch
=> SUCCESS: It detects the default rule is picked
=> SUCCESS: On changing the rules values are correctly retrieved if entering
again to the page.
=> SUCCESS: The 'Use default' text is suffixed with the correct value set by the user
in the 'All libraries' scenario.
=> Sign off :-D
Sponsored-by: DoverNet
Sponsored-by: South-East Kansas Library System
Sponsored-by: SWITCH Library Consortium
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Margaret Thrasher <p.thrasher at dover.nh.gov>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit 262b9344cd395dd9209a0aabd457b63a0207523e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 3 11:25:15 2016 -0300
Bug 14048: Unit tests
This patch introduces unit tests for the feature.
To test:
- Have all patches from this bug applied
- Run:
$ prove -v t/db_dependent/RefundLostItemFeeRule.t
=> SUCCESS: All tests pass!
Sponsored-by: DoverNet
Sponsored-by: South-East Kansas Library System
Sponsored-by: SWITCH Library Consortium
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Margaret Thrasher <p.thrasher at dover.nh.gov>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
commit 65558f20801dc7245de385af29fc7c650a8211f3
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 3 11:23:20 2016 -0300
Bug 14048: Add RefundLostItemFeeRule table and classes
This patch introduces new classes for handling refund lost item fee
rules. It introduces a new table for storing this rules.
It is designed so it is possible to define a global rule, and then
branch-specific ones. The specific is prefered if available.
This behaviour is fully tested by unit tests introduced by the following patches.
This cannot be tested on its own.
Sponsored-by: DoverNet
Sponsored-by: South-East Kansas Library System
Sponsored-by: SWITCH Library Consortium
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Margaret Thrasher <p.thrasher at dover.nh.gov>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 34 ++-
C4/Installer.pm | 1 +
C4/UsageStats.pm | 2 +-
Koha.pm | 2 +-
Koha/Exceptions.pm | 11 +-
...ualshelfcontent.pm => RefundLostItemFeeRule.pm} | 10 +-
Koha/RefundLostItemFeeRules.pm | 147 ++++++++++
Koha/Schema/Result/RefundLostItemFeeRule.pm | 66 +++++
admin/smart-rules.pl | 34 +++
installer/data/mysql/kohastructure.sql | 11 +
installer/data/mysql/sysprefs.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 32 +++
.../en/modules/admin/preferences/circulation.pref | 9 +-
.../prog/en/modules/admin/smart-rules.tt | 81 ++++++
t/db_dependent/RefundLostItemFeeRule.t | 283 ++++++++++++++++++++
t/db_dependent/UsageStats.t | 2 +-
16 files changed, 708 insertions(+), 19 deletions(-)
copy Koha/{Virtualshelfcontent.pm => RefundLostItemFeeRule.pm} (83%)
create mode 100644 Koha/RefundLostItemFeeRules.pm
create mode 100644 Koha/Schema/Result/RefundLostItemFeeRule.pm
create mode 100755 t/db_dependent/RefundLostItemFeeRule.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list