[koha-commits] main Koha release repository branch master updated. v3.20.00-817-g0dfa8c2
Git repo owner
gitmaster at git.koha-community.org
Tue Oct 20 15:54:41 CEST 2015
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 0dfa8c2b67792b86f054b32c82122607bcade2b5 (commit)
via ac9f9ced724fd61403650c5854fd1da075e7ed63 (commit)
via 2f02d4b74c6f9784dad1d7db25327b1b8a7bb3f9 (commit)
via 13bf7b302efbe527d4bdab902f2b06cf70096bc2 (commit)
via fb336f126e79223b41af229c3ec9f9a3e82c1a66 (commit)
via 63d61e7c50ec81588effd2307339bd53242536f1 (commit)
via 98f08fc340ae750ad0b8ea05a80b1c9ae47d8944 (commit)
via 9d350b693e2a66822c6c0e354aa6652d5fd8f25b (commit)
via 75c20a850ad21d2804bad889700b0228fc12357e (commit)
via 76ceaa9f2bd13f7842266c9e7c280f62fd93a369 (commit)
via 78fedb52e3acb0445d18909d23cb2af155f5e858 (commit)
from 57999441a85369b312ae41a030700b38641d4b9a (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 0dfa8c2b67792b86f054b32c82122607bcade2b5
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 20 10:52:20 2015 -0300
Bug 8236: (QA followup) fix test count error due to bad merge
On rebasing the patchset I introduced a wrong number of tests.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit ac9f9ced724fd61403650c5854fd1da075e7ed63
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 20 10:27:01 2015 -0300
Bug 11759: DBRev 3.21.00.038
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 2f02d4b74c6f9784dad1d7db25327b1b8a7bb3f9
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Oct 19 15:19:28 2015 -0300
Bug 11759: (QA followup) Sysprefs should be kosher
The introduced syspref was defined before we added new guidelines
for them. This patch puts them in sync with current standards. It also
splits them into:
- A big on/off switch (BatchCheckouts)
- Patron category filter (BatchCheckoutsValidCategories)
The latter is expected to go away if we move this into a boolean column
on the 'categories' table, which seems a better approach. I'm filling a
new bug for this last comment.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 13bf7b302efbe527d4bdab902f2b06cf70096bc2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 20 09:49:15 2015 -0300
Bug 11759: (QA followup) minor text changes
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit fb336f126e79223b41af229c3ec9f9a3e82c1a66
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Apr 10 09:42:18 2015 -0400
Bug 11759: (QA followup) Fix koha-qa errors
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit 63d61e7c50ec81588effd2307339bd53242536f1
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Apr 9 10:18:47 2015 +0200
Bug 11759: (follow-up) Some fixes
This is a squash of the following patches:
Bug 11759: (follow-up) Prevent access to the batch checkout if not allowed
If a user pass '&batch=1' to the url, he was allowed to access to the
batch checkout page even if the patron is not in an authorised
category.
This patch also fixes the link to "Batch check out" from the "Details"
tab (cf changes in circ-menu.inc).
Bug 11759: FIX Javascript error
The following JS error occurred:
ReferenceError: MSG_ADD_MESSAGE is not defined
The circulation.js file is useless and should not be included.
Bug 11759: FIX the alert message if an item is on hold.
If an item is on hold, the hold is not cancelled.
This patch corrects the message displayed in this case.
Bug 11759: FIX issue list is empty
The issue list is empty after checking an item out to a patron without
existing checkout.
To reproduce:
- Search for a patron without checkout.
- Check an item out using the "normal" checkout.
- Verify the checkout list contain the checkout.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit 98f08fc340ae750ad0b8ea05a80b1c9ae47d8944
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Feb 14 11:25:54 2014 +0100
Bug 11759: Batch checkout - DB changes
Add the new pref batch_checkouts in DB.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9d350b693e2a66822c6c0e354aa6652d5fd8f25b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Feb 14 12:53:31 2014 +0100
Bug 11759: Add some css to highlight warnings and errors
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 75c20a850ad21d2804bad889700b0228fc12357e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Feb 14 11:25:30 2014 +0100
Bug 11759: Add links to the new page
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 76ceaa9f2bd13f7842266c9e7c280f62fd93a369
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Feb 14 12:54:24 2014 +0100
Bug 11759: Batch checkout - Add the new template
This patch is the main patch.
It adds:
- the new template circ/circulation_batch_checkouts.tt
- the change into circ/circulation.pl
=== Why this feature is useful for some libraries? ===
Currently Koha does not allow to checkout several items at once to a
user. This can cause a waste of time when a user want to checkout more
than 10 items.
This development has been asked to have statistics on in-house use.
Every night, a librarian will enter a barcode list (from a file or a
scanner : the librarian scans the barcode of the documents that users
let on the tables). Barcodes will be added to a statistics patron in
order to count the number of items consulted.
The development has been expanded to cover another need: some special
libraries (BDP for "Bibliotheque departementale de pret": "Loan Regional
Library").
These libraries loan items to smaller libraries (municipal). The number
of items could be very important and the current way offered by Koha is
not adequate.
=== Test plan ===
0/ Apply all patches and execute the DB change entry.
1/ Verify you are abble to do some checkouts (with confirmations,
errors).
= Statistics way =
2/ Create a statistical patron (e.g. category code STATS).
3/ Update the batch_checkouts pref with the category code (STATS).
4/ Go on the member page and verify the new "Batch check out" tab
appears (and only for this user).
5/ Check some items out on the new page using the textarea or a file.
6/ Verify the table contains the item's information and the
"Information" column contains "Local use recorded".
= Real checkouts =
7/ Create a non statistical patron and update the pref.
8/ Check some items out on the new page using the textarea or a file.
9/ Verify the information in the table is consistent.
10/ Verify item without confirmation needed or impossible alert is
checked out.
11/ If the logged in user has the "force_checkout" permission, all
checkouts with a "confirmation needed" message can be done.
If the logged in user does not have it, there is no way to force the
checkout.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 78fedb52e3acb0445d18909d23cb2af155f5e858
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Feb 14 12:57:47 2014 +0100
Bug 11759: Batch checkout - prepare the ground
This patch does not introduce any changes.
It prepares the circulation script to accept several barcodes in
parameter.
A loop is done on all barcodes (until now, only 1) to generate a
structure to sent to the template.
At the end, only the first generated data is sent.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
circ/circulation.pl | 131 +++++++---
installer/data/mysql/sysprefs.sql | 2 +
installer/data/mysql/updatedatabase.pl | 14 +
.../intranet-tmpl/prog/en/css/staff-global.css | 7 +
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 5 +
.../en/modules/admin/preferences/circulation.pref | 11 +
.../en/modules/circ/circulation_batch_checkouts.tt | 272 ++++++++++++++++++++
t/db_dependent/Circulation.t | 2 +-
9 files changed, 408 insertions(+), 38 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list