[koha-commits] main Koha release repository branch master updated. v3.22.00-1330-g1a0ca28
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 29 12:22:01 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 1a0ca2874fc60b58db0f5f55f20871377cfe77a1 (commit)
via b87af43c4737cceef1855679f11ba277c0600358 (commit)
via 4f91c48259b2fe3fd6f1c0f1dfee0f0d99eb10d7 (commit)
via b9625bbc8ba3562602a8fe0e2375a5972f6d0cbd (commit)
via aa7b14f1f2eeb6525e33e0cd3480e82a64ccb320 (commit)
via cc7726969484222dba9a5d76aaca6c5661c24fdd (commit)
via 43902cf42dab7b56f9215b5c51e4ac8e51fd62c8 (commit)
via fc81ee50040076ba6417cd047ea72c9ced7a1414 (commit)
from e27bca77c77617f807304ca9775897a0b7a11dda (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 1a0ca2874fc60b58db0f5f55f20871377cfe77a1
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Apr 29 10:30:10 2016 +0000
Bug 15533 - DBRev 3.23.00.055
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit b87af43c4737cceef1855679f11ba277c0600358
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 28 18:54:59 2016 +0000
Bug 15533 [QA Followup] - All itemtypes for all items showing in OPAC multi-hold
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 4f91c48259b2fe3fd6f1c0f1dfee0f0d99eb10d7
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Apr 28 20:46:40 2016 +0200
Bug 15533: QA follow-up - Formatting and improving translatability
- Makes new message in the holds tables in the patron account
translatable
- Unbolds the note in the holds table for the record
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit b9625bbc8ba3562602a8fe0e2375a5972f6d0cbd
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 28 18:20:28 2016 +0000
Bug 15533 [QA Followup] - Itemtype limit missing from tables
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit aa7b14f1f2eeb6525e33e0cd3480e82a64ccb320
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 28 15:33:48 2016 +0000
Bug 15533 [QA Followup] - Move tags for translatability
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit cc7726969484222dba9a5d76aaca6c5661c24fdd
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 28 15:32:09 2016 +0000
Bug 15533 [QA Followup] - Add a system preference
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 43902cf42dab7b56f9215b5c51e4ac8e51fd62c8
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Apr 12 15:18:20 2016 +0200
Bug 15533: Fix 'ambiguous' SQL query in CanItemBeReserved
Adding reserves.itemtype made a query to fail in CanItemBeReserved.
This patch prefixes the column names with the corresponding table names
to prevent that.
You can trigger the error by running
prove t/db_dependent/Holds.t
You should see something like this:
Column 'itemtype' in where clause is ambiguous
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit fc81ee50040076ba6417cd047ea72c9ced7a1414
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Dec 25 12:05:57 2015 +0000
Bug 15533 - Allow patrons and librarians to select itemtype when placing hold
Some libraries would like the ability to select the itemtype to request
when placing holds. For example, if a record has 3 copies of BookA and 3
copies of BookA in large print, this feature would allow a person to
place a hold on the record, but still be able to target only the Large
Print edition so that the first Large Print copy that becomes available
is targeted, rather than forcing the patron to select a particular copy
to hold.
Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Create a record with items of two or more itemtypes
4) Place a record level hold on the record while choosing one particular
itemtype
5) Check in an item from the record that is not of that itemtype
6) Notee it is not trapped for the hold
7) Check in an item from the record that does match the selected itemtype
8) Note the item is trapped for the hold
Signed-off-by: Andreas Hedström Mace <andreas.hedstrom.mace at sub.su.se>
Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/HoldsQueue.pm | 23 +++-
C4/Reserves.pm | 31 ++++--
Koha.pm | 2 +-
Koha/Schema/Result/OldReserve.pm | 33 +++++-
Koha/Schema/Result/Reserve.pm | 33 +++++-
installer/data/mysql/kohastructure.sql | 9 +-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 30 ++++++
.../intranet-tmpl/prog/en/includes/strings.inc | 1 +
koha-tmpl/intranet-tmpl/prog/en/js/holds.js | 4 +
.../en/modules/admin/preferences/circulation.pref | 6 ++
.../prog/en/modules/reserve/request.tt | 21 +++-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 17 +++
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 7 +-
opac/opac-reserve.pl | 16 +--
reserve/placerequest.pl | 28 ++---
reserve/request.pl | 7 ++
svc/holds | 7 ++
t/db_dependent/Holds/HoldItemtypeLimit.t | 112 ++++++++++++++++++++
t/db_dependent/HoldsQueue.t | 66 +++++++++++-
20 files changed, 413 insertions(+), 41 deletions(-)
create mode 100644 t/db_dependent/Holds/HoldItemtypeLimit.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list