[koha-commits] main Koha release repository branch master updated. v17.11.00-1394-g9a1bed8
Git repo owner
gitmaster at git.koha-community.org
Mon May 7 17:35:43 CEST 2018
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 9a1bed84d6ac0ac5b0b9ee631363bc9cb0d74b73 (commit)
via affd3f0eceba42ec7c92706452a892823eed39e0 (commit)
via 23aa9866124064cbea8d52c1ec8f72089b4e8626 (commit)
via f0b88ed328e83877cbb98c5e3904e6b087b5a9ca (commit)
via 90d249b39dcc6702074aea7b747807d231d09024 (commit)
via ab52b1f3ac03ad4b68ac4ab7fa29e32c5efe39b9 (commit)
via 046f1f340132a97a2447a44707bdc1e2ded9a637 (commit)
via 1b67f208232bbf7efa1eee35c3b1c28e5baa8199 (commit)
via b12d5e7c20f44e12b990eaa2a083202bf8b5d43c (commit)
from 6db7ab6b93f52358bcbad60b60ad776a2cd68a23 (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 9a1bed84d6ac0ac5b0b9ee631363bc9cb0d74b73
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 7 12:22:40 2018 -0300
Bug 20531: (follow-up) Set the timestamps to the same value to get a correct order
There were 2 places where it was failing!
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit affd3f0eceba42ec7c92706452a892823eed39e0
Author: Mason James <mtj at kohaaloha.com>
Date: Tue May 1 13:24:37 2018 +1200
Bug 20686: OPAC shows 'Login to OverDrive account' with 'OverDriveCirculation' syspref disabled
ps: you will need an active and working overdrive account to test this patch
1/ prepare a koha with overdrive sysprefs set and working
(OverDriveLibraryID,OverDriveClientKey,OverDriveClientSecret)
2/ set OverDriveCirculation syspref to 'disable'
3/ do an opac search, note the 'Login to OverDrive account' message is incorrectly displayed
see pic 1
4/ apply patch
5/ do an opac search, note the 'Login to OverDrive account' message is no longer displayed (good)
see pic 2
Can confirm that bug is replicable and patch applies and functions as described.
Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 23aa9866124064cbea8d52c1ec8f72089b4e8626
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 27 13:37:53 2018 -0300
Bug 20305: Remove warnings from tools scripts
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f0b88ed328e83877cbb98c5e3904e6b087b5a9ca
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri May 4 08:10:46 2018 +0200
Bug 20687: (follow-up) Look for invitekey in show_accept and fix error codes
We should check the invitekey in show_accept by passing it along in the
search call.
On the way I fixed some error checking: if the list number is invalid, or
the list is public or you are the owner, or if the key is not found, we
should set the right error code; the template contains those messages.
Test plan:
[1] Share a list and accept a correct invitation with another user.
[2] Try to accept some invalid proposals: wrong key, wrong list.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested invalid key, wrong list, owner, public list, expiry.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 90d249b39dcc6702074aea7b747807d231d09024
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue May 1 13:47:18 2018 +0000
Bug 20687: Check all share keys for a given list
This patch gets all the shares for a list and iterates through to find
the correct one when accepting from a link
To test:
1 - Create a private list in the opac
2 - Invite 2 patrons to the list
3 - Try to accept from the patron you first shared to
4 - You will get a failure message about expiration of the link
5 - Apply patch
6 - Now try to accept the first share
7 - It works! Success!
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ab52b1f3ac03ad4b68ac4ab7fa29e32c5efe39b9
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri May 4 12:30:55 2018 -0300
Bug 20284: Fix minor compilation errors
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 046f1f340132a97a2447a44707bdc1e2ded9a637
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri May 4 12:26:39 2018 -0300
Bug 20284: (QA follow-up) superlibrarian has ill permissions
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1b67f208232bbf7efa1eee35c3b1c28e5baa8199
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Fri Apr 20 15:15:15 2018 +0100
Bug 20284: (follow-up) Added missing 'exit's
This patch adds the exits that were missing after the redirects
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b12d5e7c20f44e12b990eaa2a083202bf8b5d43c
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Mon Apr 9 14:32:21 2018 +0100
Bug 20284: ILLModuleCopyrightClearance text breaks
This patch fixes the display of the copyright notice text that is defined
in ILLModuleCopyrightClearance preference when placing ILL requests from
the OPAC. Handling of the copyrightclearance stage was missing,
this has been added.
To test:
1) Ensure you have at least one ILL backend available:
https://wiki.koha-community.org/wiki/ILL_backends
2) Ensure you have the "ILLModule" preference enabled
3) Add some text to the "ILLModuleCopyrightClearance" preference
4) Navigate to a search results page in the catalog
5) Click the "Make an Interlibrary Loan request" link at the bottom
6) Choose "Create a new request", then select a backend
7) Observe the text you added earlier is displayed with buttons for
agreeing or disagreeing (prior to this patch, this screen displayed
an error)
8) Observe that clicking "Yes" takes you to the form for adding request
details
9) Observe that clicking "No" takes you back to the "Interlibrary loan
requests" page
Signed-off-by: Barry Cannon <bc at interleaf.ie>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 1 +
.../bootstrap/en/modules/opac-illrequests.tt | 47 +++++++++++++-------
.../bootstrap/en/modules/opac-overdrive-search.tt | 2 +-
opac/opac-illrequests.pl | 30 ++++++++-----
opac/opac-shareshelf.pl | 38 +++++++---------
t/db_dependent/Members/IssueSlip.t | 5 +++
tools/batchMod.pl | 2 +-
7 files changed, 75 insertions(+), 50 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list