[koha-commits] main Koha release repository branch master updated. v3.14.00-684-g6813e56
Git repo owner
gitmaster at git.koha-community.org
Wed Apr 9 01:07:24 CEST 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 6813e560f70c5efa2e7697876ba52e47c83c447d (commit)
via 26c79241868e981a0e3a90f9ce83d28f286ee285 (commit)
via 9d9ae48a0c75d6c5dbe65c21ecf250a86cd46ffc (commit)
via f4efda5bc58e619e42493ac635cdaab78f53a950 (commit)
via ef25c3665bcde5278512225297100f26d3dc531a (commit)
via 39be2613a1fafd9a2d2805aa4c662088e53fad53 (commit)
via 7c4a00a00981a88e29fe7f2996e094f83566accb (commit)
via e005f0f9110be8fa7b66df48fb6f63084a10cc96 (commit)
via f71aa0768c596b0f9a10afb1dc06c4580b93c1ef (commit)
via acf862ba6261c8f64bd0e7c8e5a1762eecefd703 (commit)
via 065926d224005f03c6730f8fb62dfcaddb1ab0a0 (commit)
via 6fd4b4f05ae99c5850654646d81e5fde21b01dcc (commit)
via 069bf086fbc3bb5bab4527c4b7a0cf31970b184d (commit)
from c095003b865a9405014d8567bdccfaf7048fd929 (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 6813e560f70c5efa2e7697876ba52e47c83c447d
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Apr 8 23:28:21 2014 +0000
Bug 7413: (follow-up) tweak description of the AllowRenewalLimitOverride syspref
As it happens, the AllowRenewalLimitOverride serves to both allow
operators to override renewal blocks when the renewal exceed the
maximum renewal count or when the renewal is premature. This
patch adjust the wording to reflect the expansion in meaning; if
it turns out that folks want to distinguish between overriding the
maximum renewal count and overriding premature renewals, a new
system preference can be added later.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 26c79241868e981a0e3a90f9ce83d28f286ee285
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Apr 8 23:22:05 2014 +0000
Bug 7413: (follow-up) teach renew interface about too_soon
This patch ensures that the new staff interface for renewals
recognizes when premature renewals are requested. If the
AllowRenewalLimitOverride system preference is enabled, staff members
are able to override the block:
To test:
[1] Set up a loan policy with a "no renewal before" value and
check out an item.
[2] In the renewal page, verify that attempting to renew the loan
results in an error forbidding the renew.
[3] If AllowRenewalLimitOverride is enabled, the operator should
also be given the option to override the block.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 9d9ae48a0c75d6c5dbe65c21ecf250a86cd46ffc
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Apr 8 23:05:13 2014 +0000
Bug 7413: (follow-up) add direct unit tests
This patch adds a direct unit test of GetSoonestRenewDate()
and verifies that CanBookBeRenewed() returns a 'too_soon'
error as expected.
To test:
[1] Verify that prove -v t/db_dependent/Circulation.t passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit f4efda5bc58e619e42493ac635cdaab78f53a950
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Apr 8 22:52:01 2014 +0000
Bug 7413: (follow-up) improve return of GetSoonestRenewDate()
This patch modifies GetSoonestRenewDate() so that it returns
undef if the patron, item, or loan cannot be found. This
better reflects the usage of this routine GetSoonestRenewDate(),
as none of its callers tried to check the second return
value containing an error code.
This patch also updates the POD to match.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit ef25c3665bcde5278512225297100f26d3dc531a
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Apr 8 22:46:28 2014 +0000
Bug 7413: (follow-up) validate norenewalbefore values better
This patch ensures both both '0' and strings consisting of zero
or more blanks are recognized by the circ rules editor as specifying
clearing the "no renewal before" value. Concretely, this fixes
warnings of the following form when clearing this field:
Argument "" isn't numeric in numeric eq (==)
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 39be2613a1fafd9a2d2805aa4c662088e53fad53
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Apr 8 22:40:52 2014 +0000
Bug 7413: update DBIC schema classes
Note that this patch also incorpates updates
for the new branches <-> opac_news relationship.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 7c4a00a00981a88e29fe7f2996e094f83566accb
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Apr 7 18:30:17 2014 +0000
Bug 7413: DBRev 3.15.00.028
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit e005f0f9110be8fa7b66df48fb6f63084a10cc96
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Fri Feb 14 10:01:19 2014 +0100
Bug 7413: Unit test
This patch makes the new parameter norenewalbefore known to
unit test Circulation_Issuingrule.t.
To test:
1) Before applying the patch:
prove t/db_dependent/Circulation_Issuingrule.t
2) Notice that the test fails with:
$got->{norenewalbefore} = undef
$expected->{norenewalbefore} = Does not exist
3) Apply the patch.
4) Run test again and it should pass.
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
commit f71aa0768c596b0f9a10afb1dc06c4580b93c1ef
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Fri Feb 14 09:56:10 2014 +0100
Bug 7413: OPAC prog theme changes
This patch makes the prog version of opac-user.tt handle the new
renewal error "too_soon".
To test:
1) Set global syspref "opacthemes" to prog.
2) Test the same things as in previous patch.
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
commit acf862ba6261c8f64bd0e7c8e5a1762eecefd703
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Fri Feb 14 09:11:19 2014 +0100
Bug 7413: OPAC bootstrap theme changes
This patch makes opac-user.pl and the bootstrap version of opac-user.tt
handle the new renewal error "too_soon".
To test:
1) Set global syspref "opacthemes" to bootstrap.
2) Set global syspref "OpacRenewalAllowed" to Allow.
3) Test the same things as in previous patch, this time for the OPAC
summary page.
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
commit 065926d224005f03c6730f8fb62dfcaddb1ab0a0
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Thu Feb 13 17:05:08 2014 +0100
Bug 7413: Code and intranet template changes
This patch modifies CanBookBeRenewed, so that based on
issuingrules.norenewalbefore a new error "too_soon" can be returned.
Also adds a new subroutine GetSoonestRenewDate.
To test:
1) Create an issuing rule with "No renewal before" set to value X
and "Unit" set to days.
2) Test the following steps for both:
Home > Patron > Patron details
Home > Circulation > Checkouts
3) On the checkout page, test for today's issues as well as previous
issues. (Check something out on one day and something else on the
next day, then do the testing.)
4) Confirm that items can't be renewed if current date is more than
X days before due date.
5) Confirm that the date and time of the soonest possible renewal are
displayed in the format specified by global sysprefs "dateformat"
and "TimeFormat".
6) Confirm that items can be renewed if "No renewal before" is
undefined or current date is X or less days before due date.
7) Confirm that if the number of allowed renewals is exceeded
"Not renewable" is displayed, no matter what "No renewal before"
is set to.
8) Test the same things with "Unit" set to hours.
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
commit 6fd4b4f05ae99c5850654646d81e5fde21b01dcc
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Wed Feb 12 17:16:40 2014 +0100
Bug 7413: Add "No renewal before" to the circulation and fine rules
This patch adds a column "No renewal before" to the circulation and
fine rules table.
To test:
1) Add or edit some issuing rules.
2) Confirm that an empty entry, zero and non-numerical values for
"No renewal before" are saved as undefined.
3) Confirm that numerical values can be entered and saved.
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
commit 069bf086fbc3bb5bab4527c4b7a0cf31970b184d
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Wed Feb 12 16:53:06 2014 +0100
Bug 7413: Add issuingrules.norenewalbefore to database
Currently multiple renewals can be done in immediate succsession.
To optionally prevent this, a new parameter "No renewal before"
is introduced.
This patch adds issuingrules.norenewalbefore to the database.
Default value is NULL.
To test:
1) Run installer/data/mysql/updatedatabase.pl
2) Create a SQL report like:
SELECT * FROM issuingrules
3) Confirm that norenewalbefore was added after renewalperiod.
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 75 ++++++++++++++++++--
Koha/Schema/Result/Branch.pm | 19 ++++-
Koha/Schema/Result/Issuingrule.pm | 11 ++-
admin/smart-rules.pl | 10 +--
circ/circulation.pl | 6 ++
circ/renew.pl | 10 ++-
installer/data/mysql/kohastructure.sql | 1 +
installer/data/mysql/updatedatabase.pl | 8 +++
.../en/modules/admin/preferences/circulation.pref | 2 +-
.../prog/en/modules/admin/smart-rules.tt | 3 +
.../prog/en/modules/circ/circulation.tt | 32 +++++----
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 12 ++++
.../prog/en/modules/members/moremember.tt | 12 ++--
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 26 ++++---
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 19 +++--
kohaversion.pl | 2 +-
members/moremember.pl | 8 +++
opac/opac-user.pl | 17 ++++-
t/db_dependent/Circulation.t | 16 ++++-
t/db_dependent/Circulation_Issuingrule.t | 9 ++-
20 files changed, 241 insertions(+), 57 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list