[koha-commits] main Koha release repository branch master updated. v3.16.00-904-gb3b6f5a
Git repo owner
gitmaster at git.koha-community.org
Mon Nov 3 15:57:45 CET 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 b3b6f5afd0290b45109ca5b036e9296ced6e5acb (commit)
via 3af8ac071c894242e6a9f28c456a571f7aaa301e (commit)
via c2a44cb08e2587ee7bb45b2a012142cd67a83d09 (commit)
via a72aa8ab3c2adde961bf0ed946587a2dce8db061 (commit)
via 1f10ef44f8fee11b052b8eb23fc64ade2160f930 (commit)
via 1334cd33b44f0b81fcf0c72365b625a07ee248ca (commit)
via 0402e4e636605beacff69c3635218681d1d536e4 (commit)
via 64eca4693c983c39b3058ac5377724a4d0628fdd (commit)
via a72cdde31d4fa8cc252241bd0041eb9f32a7197f (commit)
via 33d285599f843cf260d64f1bea3966aa8e97d8eb (commit)
via ca138060731f89901f70a7c42ebbc8317dd58617 (commit)
via 2e72eb888016f60ce15958ecb37e0ae64f0c8454 (commit)
from c5a6a4f18a2c4eb2cb47bc302e539d3b05fcf9b1 (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 b3b6f5afd0290b45109ca5b036e9296ced6e5acb
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Nov 3 11:53:33 2014 -0300
Bug 10860: (RM followup) checkout-related sysprefs belong to the checkouts section
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3af8ac071c894242e6a9f28c456a571f7aaa301e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Oct 31 14:00:23 2014 -0400
Bug 13184 - Circulation template problems if OnSiteCheckouts is off but OnSiteCheckoutsForce is on
Checks in the circulation template for on-site checkouts preferences did
not take into account the possibility that someone might have
accidentally turned OnSiteCheckouts off but left OnSiteCheckoutsForce
turned on. This patch amends the template logic so that it works
correctly for various combinations of settings.
To test, apply the patch and test the following combinations of
circumstances.
Testing using both a patron who is blocked (expired, restricted, etc)
and a patron who is not blocked, test with...
1. OnSiteCheckouts is on, OnSiteCheckoutsForce is on
2. OnSiteCheckouts is off, OnSiteCheckoutsForce is on
3. OnSiteCheckouts is off, OnSiteCheckoutsForce is off
4. OnSiteCheckouts is on, OnSiteCheckoutsForce is off
Confirm that the checkout form is shown or not shown correctly according
to the preferences you have set. Confirm that the "Only on-site
checkouts are allowed" message is only shown in case #1.
Note: This patch includes whitespace changes, so please diff
accordingly.
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Tested on top of 10860 and 13179.
Works as described, adding more checks in the templates.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c2a44cb08e2587ee7bb45b2a012142cd67a83d09
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Oct 31 11:50:35 2014 -0400
Bug 13179 - Circulation page layout problem when OnSiteCheckoutsForce is enabled
The circulation page layout needs to work correctly for various
combinations of restrictions, no restrictions, and restrictions with
OnSiteCheckoutsForce enabled. This patch makes some minor accomodation
for all.
To test, load a patron for checkout under the following conditions:
1. OnSiteCheckoutsForce and patron is not blocked from checkout
2. OnSiteCheckoutsForce is off, patron is blocked from checkout (for
being expired or restricted).
3. OnSiteCheckoutsForce is on and patron is not blocked from checkout
4. OnSiteCheckoutsForce is on and patron is blocked from checkout
The page layout should look correct for all these cases, with a clean
two-column layout of [ checkout form | messages ] in all cases except
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Applied on top of 10860. Works as described.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a72aa8ab3c2adde961bf0ed946587a2dce8db061
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Nov 3 11:21:19 2014 -0300
Bug 10860: Update DBIx
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1f10ef44f8fee11b052b8eb23fc64ade2160f930
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Nov 3 10:36:01 2014 -0300
Bug 10860: DBRev 3.17.00.044
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1334cd33b44f0b81fcf0c72365b625a07ee248ca
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 31 05:31:24 2014 -0400
Bug 10860 [QA Followup] - Use Koha.Preference
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0402e4e636605beacff69c3635218681d1d536e4
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Oct 30 20:33:35 2014 +0100
Bug 10860: Follow-up - fix some template variable issues
Fixing some simple display issues caused by missing/misnamed
variables, probably consequence of the renaming before.
Amended test plan:
- Make sure that if OnSiteCheckoutsForce is set, you can
still perform onsite checkouts and only those.
- Check the detail page in staff says *currently in local use by*
for an on-site checked out item
- Check the detail page in OPAC with OPACShowCheckoutName active
for the same.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 64eca4693c983c39b3058ac5377724a4d0628fdd
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Oct 30 11:07:50 2014 -0400
Bug 10860 [QA Followup] - Rename system preferences
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a72cdde31d4fa8cc252241bd0041eb9f32a7197f
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Oct 30 00:10:00 2014 +0100
Bug 10860: Follow-up - staff reading record
- capitalization fix "Checked out"
- display new tabs only when feature is activated
- fixes a qa script complaint about POD in Items.pm
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 33d285599f843cf260d64f1bea3966aa8e97d8eb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 22 02:18:03 2014 -0400
Bug 10860 [QA Followup] - Fix misc issues
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ca138060731f89901f70a7c42ebbc8317dd58617
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 22 01:04:25 2014 -0400
Bug 10860 - Change "in-house use" to "on-site checkout"
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2e72eb888016f60ce15958ecb37e0ae64f0c8454
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Sep 18 14:16:49 2013 +0200
Bug 10860: In-House Use
This patch implements the In-House Use feature for Koha.
It adds:
- 2 new sysprefs:
'In-House Use' to enable/disable this feature
'In-House Use Forced' to enable/disable the feature for *all* users.
- 2 new columns issues.inhouse_use and old_issues.inhouse_use
- Datatable on the circulation history pages (readingrec) at the OPAC
and the intranet.
A new checkbox in the Circulation tab. If checked, the issue become a
in-house use (in the statistics and issues tables).
When you check it, the due date changes to the today date.
The syspref "In-House Use Force" allows to force the in-house use to
permit the checkout even if the borrower is debarred or others problems.
In the issue table, a new string (in red) marks the issue as "in-house use".
The circulation history contains 3 tabs : "all", "checkout" and
"in-house use" (OPAC and intranet).
The cronjob script:
If AutomaticItemReturn if off, a library would like not to do a transit
operation manually. This script (to launch each night) do returns
for a specific branches.
Test plan:
1/ Execute the updatedatabase entry
2/ Enable the 'In-House Use' pref.
3/ Checkout a biblio for a patron and check the 'in-house use' checkbox.
4/ Check that the due date is the today date (with 23:59) and is not modifiable.
5/ Click on the check out button and check that the new check out
appears in the table bellow with the "(In-house use)" string.
6/ Go on the circulation history pages (readingrec and opac-readingrec)
and try the 3 tabs. In the last one, your last checkout should appear.
7/ Check in.
8/ Check readingrec pages.
9/ Choose a debarred patron and check that you cannot checkout a biblio
for him.
10/ Switch on the 'In-House Use Forced' pref
11/ You are now allowed to checkout a biblio for the debarred patron.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 15 +-
C4/Items.pm | 11 +-
C4/Stats.pm | 2 +-
Koha/Schema/Result/Issue.pm | 12 +-
Koha/Schema/Result/OldIssue.pm | 12 +-
circ/circulation.pl | 25 ++-
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/sysprefs.sql | 2 +
installer/data/mysql/updatedatabase.pl | 22 +++
.../intranet-tmpl/prog/en/css/staff-global.css | 14 ++
.../intranet-tmpl/prog/en/includes/strings.inc | 1 +
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 25 ++-
.../intranet-tmpl/prog/en/js/pages/circulation.js | 4 +
.../en/modules/admin/preferences/circulation.pref | 12 ++
.../prog/en/modules/catalogue/detail.tt | 8 +
.../prog/en/modules/circ/circulation.tt | 70 +++++--
.../prog/en/modules/members/readingrec.tt | 129 ++++++++-----
koha-tmpl/opac-tmpl/bootstrap/css/datatables.css | 194 ++++++++++----------
.../bootstrap/en/includes/item-status.inc | 8 +
koha-tmpl/opac-tmpl/bootstrap/js/datatables.js | 2 +-
kohaversion.pl | 2 +-
svc/checkouts | 3 +
t/db_dependent/Circulation.t | 2 +-
23 files changed, 380 insertions(+), 197 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list