[koha-commits] main Koha release repository branch master updated. v3.16.00-599-gcd69768
Git repo owner
gitmaster at git.koha-community.org
Thu Sep 18 01:11:55 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 cd69768f72493d9ec2f2e8015e6f435e9cff18f4 (commit)
via eb4df0eff2960772522946bc451803a0af8fb87f (commit)
via 84548dcba952e0a32db84ea26d0a3be272e5cec2 (commit)
via 788d6bd724abf2573f699a90d0b7857e01264584 (commit)
via 6d022bd4a40358d08b3ef3f2a5fd6fdde2f1a336 (commit)
via 904b35645cb01de36ff72450decf80c55a80da08 (commit)
via d02f87a2986bd20e513e02ab299a9b66af9ea08f (commit)
via 17821c58ccbeeb719e283e7932064e6ea61d657e (commit)
via 0270b8d3b6a8974fae64340cbfc6228692369d00 (commit)
via 555d0d5898faccaf0d8c4c3c39630a23089b57c2 (commit)
via b49bcfef092b86d875749ce79501aec77d055515 (commit)
via 633f6c150ed26b3a22bdef24bf06fab9273c4eb1 (commit)
via 282aa8ffced619b17be398065ed74b3cf44146d3 (commit)
from 84b4ace746699318e16f5c7a07023dbb3af55efd (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 cd69768f72493d9ec2f2e8015e6f435e9cff18f4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Aug 27 09:05:12 2014 -0400
Bug 10883 - AllowHoldDateInFuture can let a patron jump to the top of the holds list
If a patron is allowed to add a future date for the hold using the
"Hold starts on date" field, that patron can put a date in that is
in the *past* which will cause them to move to the top of the holds
queue ( assuming they make the past date far enough back that it is
earlier than all the other hold dates ).
Test Plan:
1) Enable future holds
2) Note you can use dates in the past for "hold starts on date"
3) Note you can use dates in the past for "hold expires on date"
4) Apply this patch
5) Refresh the page
6) Note you can no longer use dates in the past for those fields
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Changed subject: OpacAllowHoldDateInFuture to AllowHoldDateInFuture
as this fix applies to staff.
Works as described, passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit eb4df0eff2960772522946bc451803a0af8fb87f
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Sep 17 20:08:14 2014 -0300
Bug 11577: DBRev 3.17.00.024
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 84548dcba952e0a32db84ea26d0a3be272e5cec2
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Aug 27 17:32:38 2014 +0000
Bug 11577 : Fixing a tiny copy/paste issue
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 788d6bd724abf2573f699a90d0b7857e01264584
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date: Tue Jul 29 17:58:57 2014 +1200
Bug 11577 : Fixing a tiny typo
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 6d022bd4a40358d08b3ef3f2a5fd6fdde2f1a336
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Thu May 22 10:21:09 2014 +0200
Bug 11577: Add Hochschule für Gesundheit to contributing institutions
Automatic renewal is the second feature sponsored by the hsg.
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 904b35645cb01de36ff72450decf80c55a80da08
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Mon May 19 14:00:48 2014 +0200
Bug 11577: Unit tests
This patch fixes two unit tests that broke because of the new feature.
Also adds some new test cases.
To test:
1) prove t/db_dependent/Circulation.t
2) prove t/db_dependent/Circulation_Issuingrule.t
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d02f87a2986bd20e513e02ab299a9b66af9ea08f
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Fri May 16 13:14:32 2014 +0200
Bug 11577: Add an automatic renewal cronjob
This patch adds a new cron script automatic_renewals.pl and a new
entry in crontab.example.
To test:
1) You need a few issues, some with automatic renewal and some without.
2) Confirm that each time you run misc/cronjobs/automatic_renewals.pl
those issues are renewed that meet all of the following criteria:
- automatic renewal has been scheduled either by issuing rule or by
checkbox on the checkout page
- the number of allowed renewals isn't exceeded
- renewal isn't premature (No renewal before)
3) Confirm that all other issues are not affected.
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 17821c58ccbeeb719e283e7932064e6ea61d657e
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Thu May 15 16:48:02 2014 +0200
Bug 11577: OPAC bootstrap theme changes
This patch makes opac-user.pl and the bootstrap version of opac-user.tt
handle the new renewal errors "auto_renew" and "auto_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: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0270b8d3b6a8974fae64340cbfc6228692369d00
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Wed May 21 15:45:35 2014 +0200
Bug 11577: Expand description of AllowRenewalLimitOverride
With the introduction of the new automatic renewal feature global syspref
AllowRenewalLimitOverride is expanded in meaning. It now gives the option
to override blocks if:
- the number of allowed renewals is exceeded
- the renewal is premature (No renewal before)
- the item is scheduled for automatic renewal
- the renewal is premature and the item is scheduled for automatic renewal
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 555d0d5898faccaf0d8c4c3c39630a23089b57c2
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Wed May 21 15:15:11 2014 +0200
Bug 11577: Add 'auto_renew' and 'auto_too_soon' to renewal page
This patch adds the new renewal errors 'auto_renew' and 'auto_too_soon'
to the renewal interface.
To test:
1) Issue two items:
- one with automatic renewal and no value for "No renewal before"
- another with automatic renewal and a value for "No renewal before"
2) Try to renew:
Home > Circulation > Renew
3) Confirm there are error messages explaining that the items have been
scheduled for automatic renewal and that one of the renewals is also
premature.
4) If global syspref AllowRenewalLimitOverride is set to "Allow" you
should be given the option to override.
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b49bcfef092b86d875749ce79501aec77d055515
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Thu May 15 16:43:00 2014 +0200
Bug 11577: Code and intranet template changes
This patch adds a checkbox for "Automatic renewal" to the checkout page.
CanBookBeRenewed is modified to include two new errors:
- auto_renew (renewal shouldn't be done manually)
- auto_too_soon (renewal is premature and shouldn't be done manually)
To test:
1) Add or edit an issuing rule with "Automatic renewal" and another
one without it.
2) Issue at least three items:
- automatic renewal by issuing rule
- automatic renewal by Checkbox on the checkout page
- no automatic renewal
3) Test the following steps for both:
Home > Circulation > Checkouts
Home > Patrons > Patron details
4) Confirm that issues with automatic renewal cannot be renewed manually,
even if there are still renewals left and it's not too soon to renew.
5) Confirm that "Scheduled for automatic renewal" and the remaining
renewals are displayed. If no renewals are left "Not renewable" should
be displayed.
6) Confirm that issues without automatic renewal behave as usual.
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 633f6c150ed26b3a22bdef24bf06fab9273c4eb1
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Thu May 15 16:30:39 2014 +0200
Bug 11577: Add "Automatic renewal" to the circulation and fine rules
This patch adds a column "Automatic renewal" to the circulation and
fine rules table.
To test:
1) Add or edit some issuing rules.
2) Confirm that "Automatic Renewal" is set to "No" by default and
can be switched to "Yes".
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 282aa8ffced619b17be398065ed74b3cf44146d3
Author: Holger Meißner <h.meissner.82 at web.de>
Date: Thu May 15 16:18:36 2014 +0200
Bug 11577: Add auto_renew flags to the database
- issues.auto_renew
- old_issues.auto_renew
- issuingrules.auto_renew
Default value is zero.
To test:
1) Run installer/data/mysql/updatedatabase.pl
2) Create SQL reports like:
SELECT * FROM issues LIMIT 0,1
3) Confirm that a column auto_renew was added to each of the three tables.
Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 67 ++++++++++----------
admin/smart-rules.pl | 9 +--
circ/circulation.pl | 7 +-
circ/renew.pl | 2 +-
debian/koha-common.cron.daily | 1 +
installer/data/mysql/kohastructure.sql | 3 +
installer/data/mysql/updatedatabase.pl | 15 +++++
.../intranet-tmpl/prog/en/includes/strings.inc | 2 +
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 14 ++++
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 1 +
.../en/modules/admin/preferences/circulation.pref | 2 +-
.../prog/en/modules/admin/smart-rules.tt | 14 ++++
.../prog/en/modules/circ/circulation.tt | 9 +++
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 24 +++++++
.../prog/en/modules/reserve/request.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 3 +
kohaversion.pl | 2 +-
misc/cronjobs/automatic_renewals.pl | 60 ++++++++++++++++++
misc/cronjobs/crontab.example | 3 +
opac/opac-user.pl | 6 +-
t/db_dependent/Circulation.t | 32 +++++++++-
t/db_dependent/Circulation_Issuingrule.t | 9 ++-
22 files changed, 241 insertions(+), 46 deletions(-)
create mode 100644 misc/cronjobs/automatic_renewals.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list