[koha-commits] main Koha release repository branch master updated. v18.11.00-220-g9a9557a
Git repo owner
gitmaster at git.koha-community.org
Fri Jan 25 19:12:24 CET 2019
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 9a9557a1b9d529a6cdd586d70599a39baf5fa961 (commit)
via c37ded96714409cd572c79f3c9cd69694e0e71de (commit)
via c3fb484fe2922d2a97053b3fde4fb433c5aa0c4f (commit)
via b93c5dcbfdeafc2758cb880bea02ca91c0ef4e67 (commit)
via 8c0c6be7488e0543662e47006ded12e74ae4eb8d (commit)
via 4f0618a8888dff72b15dfe9193259c1bc5d06b5f (commit)
via 495619649b329ce52b86998668461ca72827c6ab (commit)
via 9f446de79128352fe5138bb22260a49254c65450 (commit)
via 6e4e4c9cbc04b42653599b4ddea35cbaa57e42f3 (commit)
via 90a43b1868a068b54e398c1df2227a6b6cf93875 (commit)
via 6764bda2a9eaba37c2eeaf635165b5f0c9abd530 (commit)
via 874479a474d9a3fe451c22b8d73b5d4995024363 (commit)
via 2c2d0cd6993561d9b3efa8aa5843200f31b29094 (commit)
via 2cd3a7187175390258572954685f1475a3e12ecd (commit)
via 3a69ec5e050cb7a00fa98e360235941ccc3eb4a1 (commit)
via 07c91b2116ebb991ff064f26a0a700d6bca43362 (commit)
via 68803f3ddb64006b4eadbb4aa9669ad40187d0fb (commit)
via 02d3d4a8f55e5164f7bb2b87fe1cbbb6b607355d (commit)
via b028a2d1a53a7106a00a7ec6a860e813c0781342 (commit)
via 2101d0af0034bf8278893b4d4ca7d80c29b3bc75 (commit)
from 09282c9e56216b3be7dcf904ce00fcd8f7766f84 (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 9a9557a1b9d529a6cdd586d70599a39baf5fa961
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Oct 25 19:02:31 2018 +0000
Bug 21672: Switch templates to Bootstrap grid: Various
This patch modifies various templates to add or improve coverage of the
Bootstrap grid.
To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:
- Administration -> Item circulation alerts
- Authorities -> Authorities search -> Merge records
- Catalog -> Bibliographic details -> Rota (StockRotation must be
enabled)
- Tools -> News: Main and add/edit view
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c37ded96714409cd572c79f3c9cd69694e0e71de
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Jan 5 03:50:36 2019 +0000
Bug 22111: Format amount shown on place holds when maxoutstanding is reached (staff)
Displays amount outstanding correctly when holds are blocked
by maxoutstanding.
To test:
- Check maxoutstanding system preference value
- Add a fine to a patron account exceeding maxoutstanding
- Try to place a hold for this patron from staff
- Verify this message is shown:
Patron has outstanding fines: 6.00
- Toggle CurrencyFormat system preference and verify display
changes according to setting
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Mikael Olangcay Brisebois <mikael.olangcay-brisebois at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c3fb484fe2922d2a97053b3fde4fb433c5aa0c4f
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Jan 5 05:41:48 2019 +0000
Bug 22113: Add price formatting on item lost report
The item lost report displays the price and replacement
price for lost items. With the patch they will display
according to the CurrencyFormat system preference.
To test:
- Mark 1 or more items lost
- Make sure that replacement cost and purchase price are set
- Go to Reports > Items lost
- Search for your lost items
- Verify price and replacement price display
- Apply patch and toggle CurrencyFormat to different settings
- Refresh lost items report
- Verify prices are always displayed according to syspref setting
Signed-off-by: Olivia Lu <olivialokm at gmail.com>
Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos at inLibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b93c5dcbfdeafc2758cb880bea02ca91c0ef4e67
Author: Olivia Lu <olivialokm at gmail.com>
Date: Wed Jan 16 03:54:25 2019 +0000
Bug 21855: Changed "deprecated delete_unverified_opac_registrations.pl cronjob" to "cleanup_database"
To Find Fix:
1. Go to Koha Administration
2. Search PatronSelfRegistrationVerifyByEmail
3. Verify that NOTE now says "system preference requires the
cleanup_database ..."
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Mikael Olangcay Brisebois <mikael.olangcay-brisebois at inlibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8c0c6be7488e0543662e47006ded12e74ae4eb8d
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Tue Mar 6 13:29:22 2018 -0500
Bug 18909: Enable the maximum zebra records size to be specified per instance
The default for Zebra is to not return results where the record size is
greater than 1045 KB ( 1 MB ). Some libraries need to increase this
ceiling, but it may come at a cost with z39.50 compatibility with other
services. For that reason, we should make this setting configurable on a
per-instance basis.
Test plan for kohadevbox:
1) Apply this patch
2) Run:
$ reset_all
3) Restart Zebra:
$ sudo koha-zebra --restart kohadev
4) Check how zebrasrv was called:
$ ps waux | grep zebrasrv
=> SUCCESS: Looks like
... /usr/bin/zebrasrv -v none,fatal,warn -k 1024
5) Edit /etc/koha/sites/kohadev/koha-conf.xml, add:
<zebra_max_record_size>2048</zebra_max_record_size>
6) Repeat (3) and (4)
=> SUCCESS: Looks like
... /usr/bin/zebrasrv -v none,fatal,warn -k 2048
7) Sign off :-D
General test plan:
1) Apply this patch
2) Build a Debian package
3) Specify a zebra_max_record_size of 2048 in your koha_conf.xml
4) Restart zebra
5) Index a record greater than 1 MB but smaller than 2 MB
6) Note that it is searchable!
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Hugo Agud <hagud at orex.es>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4f0618a8888dff72b15dfe9193259c1bc5d06b5f
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Jan 12 09:21:38 2019 +0100
Bug 22118: Format hold fee when placing holds in OPAC
When Koha charges for holds, a message with the fee is
shown before the patron places the hold. The amount needs
to be formatted according to CurrencyFormat system preference.
To test:
- Add a hold fee to your patron category
- Log into the OPAC
- Search for a record to place a hold on
- Click Place hold
- Verify there is a note showing about the hold fee
- Toggle CurrencyFormat and HoldFeeMode and verify
that the formatting is always correct
Signed-off-by: Jack Kelliher <jke0429 at stacmail.net>
Signed-off-by: Mikael Olangcay Brisebois <mikael.olangcay-brisebois at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 495619649b329ce52b86998668461ca72827c6ab
Author: Jasmine Amohia <jasmineamohia.student at wegc.school.nz>
Date: Thu Jan 17 02:32:08 2019 +0000
Bug 11922: Add SHOW_BCODE patron attribute for Norwegian web installer
Test plan:
1. Notice that /patron_attributes.sql and /patron_attributes.txt can be
located in 2-Valgfritt
2. Confirm that the SHOW_BCODE patron attribute in the English web
installers .sql and .txt file is also in the Norwegian web installers
.sql and .txt file
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9f446de79128352fe5138bb22260a49254c65450
Author: Jasmine Amohia <jasmineamohia.student at wegc.school.nz>
Date: Wed Jan 16 02:11:42 2019 +0000
Bug 19920: Removed unnecessary code from C4/Members.pm
A seperate bug (Bug 16853) removed the subroutine used in this file. I removed the code as it had become unnecessary.
Test plan:
1. Confirm that &changepassword can't be found in C4/Members.pm
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6e4e4c9cbc04b42653599b4ddea35cbaa57e42f3
Author: helene hickey <hickeyhe at wgc.school.nz>
Date: Wed Jan 16 22:06:15 2019 +0000
Bug 20491: Updating the MARC subfield desciption of 952q
Test plan:
1) Go to admin, then to MARC frameworks, then to default
frameworks structure, then subfield stucture for 952
2) Verify that 'q'
is described as 'checked out'
3) Go to <intranet>/cgi-bin/koha/cataloguing/additem.pl?biblionumber=x
4) Verify
that 'q' is also descirbed as 'Checked out' in
5) Apply patch and update
your database
6) Verify that the description of 'q' has changed to 'Date
due'
7) Go to <intranet>/cgi-bin/koha/cataloguing/additem.pl?biblionumber=x
6) Verify that it has changed to 'Date due'
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Bug 20491: (QA follow-up) Remove atomic update
We should not update existing installations, especially
since this would not work for translated frameworks.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 90a43b1868a068b54e398c1df2227a6b6cf93875
Author: helene hickey <hickeyhe at wgc.school.nz>
Date: Wed Jan 16 02:16:26 2019 +0000
Bug 7403: Shorten CataloguingLog preference description
To test:
1) Look at value of CataloguingLog prefernce
2) Apply the patch and the value should change
3) Verify that the warning has been removed
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6764bda2a9eaba37c2eeaf635165b5f0c9abd530
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jan 22 13:54:59 2019 -0500
Bug 7614: (QA follow-up) Remove unused variable
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 874479a474d9a3fe451c22b8d73b5d4995024363
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jan 22 13:50:39 2019 -0500
Bug 7614: (QA follow-up) Tidy code to remove tab characters
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2c2d0cd6993561d9b3efa8aa5843200f31b29094
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jan 22 13:49:13 2019 -0500
Bug 7614: (QA follow-up) Fix POD merge missed in rebase
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2cd3a7187175390258572954685f1475a3e12ecd
Author: Kyle M Hall <kyle at bywatersolutiosn.com>
Date: Mon Aug 20 10:48:07 2018 -0400
Bug 7614: Don't allow un-usable pickup locations in the opac pickup locations pulldown
Also fully qualifies some subroutine calls that fail for reasons unkown.
Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3a69ec5e050cb7a00fa98e360235941ccc3eb4a1
Author: Lari Taskula <lari.taskula at jns.fi>
Date: Thu Dec 21 16:55:58 2017 +0200
Bug 7614: (follow-up) If patron's home library is not a pickup library, let them choose another one
This patch fixes an issue where patron is not allowed to place a hold in OPAC
while their home library is not a pickup library.
Instead, they should be presented with a list of other available pickup locations.
Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 07c91b2116ebb991ff064f26a0a700d6bca43362
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date: Thu Mar 9 13:06:20 2017 +0200
Bug 7614: Fix my variable earlier declaration bug.
Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 68803f3ddb64006b4eadbb4aa9669ad40187d0fb
Author: Lari Taskula <lari.taskula at jns.fi>
Date: Fri Feb 10 17:10:49 2017 +0200
Bug 7614: Build a list of pickup locations in OPAC considering transfer limits
This patch enables the checks for transfer limits for given biblionumber in
OPAC when patron proceeds to place a hold. In case none of the items of that
biblio can be transferred to a library, that library will not be included in
the list of pickup locations.
To test:
1. Make sure you meet the following requirements:
1.1: You are able to make holds in OPAC
1.2: System preference UseBranchTransferLimits set to "Enforce"
1.3: System preference BranchTransferLimitsType set to "item type"
(for the sake of simplicity of this test plan, but you may also
set it to "collection code" and deal with ccodes instead)
1.4: System preference item-level_itypes set to "specific item"
1.5: You have the default libraries and item types, otherwise replace
the branchcodes and itemtypes in this test plan with your own
2. Make sure 'Fairfield' in cgi-bin/koha/admin/branches.pl has not disabled
its ability to act as a "Pickup location"
3. Have a biblio with exactly one item of item-level itemtype 'BK'
4. Set item holdingbranch as 'CPL'
5. Go to cgi-bin/koha/admin/branch_transfer_limits.pl (keep this page open in
a second tab for faster testing)
6. Select library 'Centerville'
7. Uncheck the checkbox 'FFL - Fairfield' and click Save
8. Go to OPAC and find your biblio, and start placing a hold on it
9. Click at the list of "Pick up location"s.
10. Observe that it is missing 'Fairfield'
11. Go back to cgi-bin/koha/admin/branch_transfer_limits.pl
12. Repeat step 6 and this time, check the checkbox 'FFL - Fairfield'
13. Refresh the page you arrived at step 8
14. Observe that it now includes 'Fairfield'
Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 02d3d4a8f55e5164f7bb2b87fe1cbbb6b607355d
Author: Kyle M Hall <kyle at bywatersolutiosn.com>
Date: Wed Aug 15 14:27:45 2018 -0400
Bug 7614: Consider transfer limits in Koha::Template::Plugin::Branches
Consider transfer limits in Koha::Template::Plugin::Branches->pickup_locations.
This patch modified the mentioned method to consider branch transfer limits and
does not include any library in the returned list of libraries in case a branch
transfer limit applies for a given book or item.
To be tested in following patches.
Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b028a2d1a53a7106a00a7ec6a860e813c0781342
Author: Lari Taskula <lari.taskula at jns.fi>
Date: Tue Feb 7 17:51:18 2017 +0200
Bug 7614: Check transfer limit in CanBookBeReserved and CanItemBeReserved
This patch adds $branchcode_to parameter to CanBookBeReserved and
CanItemBeReserved. It represents the pickup location for the hold. This patch
checks if the library is configured to be a pickup location (see Bug 7534), and
also if the item can be transferred into the given library (see Bug 18072).
To test:
1. prove t/db_dependent/Holds.t
Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2101d0af0034bf8278893b4d4ca7d80c29b3bc75
Author: Lari Taskula <lari.taskula at jns.fi>
Date: Thu Feb 9 19:21:32 2017 +0200
Bug 7614: Add a new method Koha::Libraries->pickup_locations
This patch adds a new method, Koha::Libraries->pickup_locations. This method
takes either an item or a biblio as a parameter, and returns the list of
acceptable pickup locations by considering libraries' configuration to act
as a pickup location as well as any branch transfer limits that may apply.
To test:
1. prove t/db_dependent/Koha/Libraries.t
Signed-off-by: Bob Bennhoff <bbennhoff at clicweb.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Items.pm | 20 +-
C4/Members.pm | 5 -
C4/Reserves.pm | 5 +
Koha/Libraries.pm | 71 ++++
Koha/Template/Plugin/Branches.pm | 21 ++
debian/scripts/koha-functions.sh | 11 +
debian/scripts/koha-zebra | 2 +
debian/templates/koha-conf-site.xml.in | 1 +
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../Obligatoire/marc21_framework_DEFAULT.sql | 2 +-
.../Optionnel/marc21_simple_bib_frameworks.sql | 16 +-
.../2-Valgfritt/patron_attributes.sql} | 0
.../2-Valgfritt/patron_attributes.txt} | 0
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 +-
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 +-
.../prog/en/includes/merge-record-strings.inc | 2 +-
.../en/modules/admin/item_circulation_alerts.tt | 11 +-
.../prog/en/modules/admin/preferences/logs.pref | 2 +-
.../prog/en/modules/admin/preferences/opac.pref | 2 +-
.../prog/en/modules/authorities/merge.tt | 26 +-
.../prog/en/modules/catalogue/stockrotation.tt | 25 +-
.../prog/en/modules/reports/itemslost.tt | 5 +-
.../prog/en/modules/reserve/request.tt | 3 +-
.../prog/en/modules/tools/koha-news.tt | 33 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 12 +-
.../delete_unverified_opac_registrations.pl | 66 ----
opac/opac-reserve.pl | 19 +-
t/db_dependent/Holds.t | 25 +-
t/db_dependent/Koha/Libraries.t | 347 +++++++++++++++++++-
31 files changed, 598 insertions(+), 172 deletions(-)
copy installer/data/mysql/{en/optional/patron_atributes.sql => nb-NO/2-Valgfritt/patron_attributes.sql} (100%)
copy installer/data/mysql/{en/optional/patron_atributes.txt => nb-NO/2-Valgfritt/patron_attributes.txt} (100%)
delete mode 100755 misc/cronjobs/delete_unverified_opac_registrations.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list