[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.08-20-g3f75695
Git repo owner
gitmaster at git.koha-community.org
Mon Jul 30 15:57:16 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, 17.11.x has been updated
via 3f75695c7ac15da3c32622aaef02e696e3a7455a (commit)
via b8046fc86d17ff8edb52549b13a51c8d14883ff5 (commit)
via 79a54a394c234b87b62cc63e32aedfff16fc5f0a (commit)
via 957630b69c54dc665bc9e49626eb9f2929f06da7 (commit)
via de108c3643dc371ca52755a9e2cfbb537c8a64b6 (commit)
via 9e59bd8852c613aad2848b80d161136d278b282b (commit)
via 628f212ed946f9a8f1114269c8927da0606aed29 (commit)
via b470ea71cc67eeba2c942f65cb67331ec38eb7ed (commit)
via f09fbab4c85c38992a2638d4ce7a9a26ab7c352b (commit)
via 01ff596b723cde5b577dc16581ee57fee02d5b22 (commit)
via 6d788bcd29f16c77ad88f7fddd308752fd957bb0 (commit)
from 4e87e8bb74fa0fe92305cb1befa1aad644b7aa2a (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 3f75695c7ac15da3c32622aaef02e696e3a7455a
Author: Charles Farmer <charles.farmer at inLibro.com>
Date: Fri Jun 29 16:12:59 2018 -0400
Bug 21025: Add GetPreparedLetter to Koha::Patron::Discharge
Test plan (shamelessly ripped from Bug20953):
1) Set system preference 'useDischarge' to 'Allow'
2) Choose a patron without checkouts nor fines nor restrictions
3) Log at OPAC and go to patron page /cgi-bin/koha/opac-user.pl
4) Click on 'ask for a discharge' tab
=> You see /cgi-bin/koha/opac-discharge.pl
with text 'What is a discharge? ...'
5) Click on 'Ask for a discharge' link
=> You see /cgi-bin/koha/opac-discharge.pl?op=request
with text 'Your discharge request has been sent ...'
6) In a new browser tab/page, go to intranet on /cgi-bin/koha/members/discharges.pl
=> You see one discharge requets for the patron
=> Click on 'allow' on patron discharge request
7) Come back to OPAC and refresh /cgi-bin/koha/opac-discharge.pl
=> You see link 'Get your discharge'
8) Click on the link to get your generated PDF
=> An error message should appear informing you to contact your website's admin
9) Apply this patch
10) Click again on the link to get your generated PDF
=> This time, a download prompt should appear
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 654abf9966bd340689b1944a7e5266cde7127321)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b8046fc86d17ff8edb52549b13a51c8d14883ff5
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jun 18 15:29:37 2018 +0000
Bug 20698: Remove obsolete template: transfer-slip.tt
This patch removes an unused template file, circ/transfer-slip.tt. Its
use was removed by Bug 7001:
http://git.koha-community.org/gitweb/?p=koha.git;a=commitdiff;h=a9ded4fa008668df8c485fbbc76efa3cc9cc00d7#patch12
To test, apply the patch and confirm that the file has been removed.
Confirm that no references to the template exist in the codebase.
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>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 0536b99e6dfdf7e21dcf62963ed3f1449d434d3d)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 79a54a394c234b87b62cc63e32aedfff16fc5f0a
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Mon Mar 5 12:10:56 2018 +0200
Bug 20332: Allow translating some grouped opac results texts
The grouped OPAC results page has several untranslatable
javascript-added texts, including the selection modifiers "Clear all"
and "Select all" links, and the entries in the shelves/lists dropdown.
Compare to opac-results.tt
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 53e0523207738cd489d77007c8e642b88030d4c6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 957630b69c54dc665bc9e49626eb9f2929f06da7
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 13 11:48:42 2018 +0000
Bug 20090: (RM follow-up) Add missing paren
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 43f509b08e7d30bca6c88e094bbfa763d036bf67)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit de108c3643dc371ca52755a9e2cfbb537c8a64b6
Author: David Kuhn <techservspec at gmail.com>
Date: Thu Jan 25 09:27:19 2018 -0800
Bug 20090: Missing script statement for Novelist Select on some record displays in OPAC
This patch adds a check for UPCs and well as ISBNs to the Novelist Select conditionals in opac-detail.tt
To test (note that you must subscribe to Novelist Select):
1. If your library does not use the raton ratings feature, activate it for the purposes of this test.
2. Display a record that does not have an ISBN in the 020 field, but has a upc (or other code) in the 024 field. The rating option will
display as 5 radio buttons and a "rate it" button.
3. Apply the patch.
4. Display the same record again. The radio buttons will be replaced with stars. This indicates that the scripts on the page completed.
Rather that using the patron ratings as in indicator, you can also use a web page inspector/debugger such as firebug or the built-in
inspectors in most newer browsers to check for script errors.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
I couldn't check with Novelist Select, but read and checked changed made carefully.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 7662f4873e97272c677f4912c22aeeec25097bc2)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 9e59bd8852c613aad2848b80d161136d278b282b
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 29 11:52:16 2018 -0300
Bug 21023: Remove warning in t/db_dependent/Circulation/Chargelostitem.t
To test:
- Run:
$ kshell
k$ prove t/db_dependent/Circulation/Chargelostitem.t
=> FAIL: Warning is displayed
- Apply this patch
- Run:
k$ prove t/db_dependent/Circulation/Chargelostitem.t
=> SUCCESS: Tests pass! No warning!
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
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>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit ce63b26b476415f30cecd7be97b52b60c07341d1)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 628f212ed946f9a8f1114269c8927da0606aed29
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 4 16:03:33 2018 +0200
Bug 14446: Workaround to resolve uninitialized value in goto warning
Forcing both GetTab calls to list context resolves the warning.
A workaround, not a real fix.
Test plan:
Search for something in the syspref text bar.
Without this patch, you will have a warn: Use of uninitialized value in goto
With this patch, you won't.
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 1d6760f01a674ff52d96a1a342d68a7e5c9a6c8a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b470ea71cc67eeba2c942f65cb67331ec38eb7ed
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 14 11:31:02 2018 -0300
Bug 20919: Remove unecessary search calls on the biblio detail page
There is a countanalytics flag that is set for items used in analytical
biblio records. This flag is only used in the template when 'analyze'
has been passed to the script.
In order to avoid unecessary search calls (1 per item), $analyse must be
tested.
Test plan:
0. Do not apply the patch
1. tail -f /var/log/koha/kohadev/zebra-output.log
2. Hit a bibliographic record detail page with several items
3. Notice that the log has 1 line per item:
11:30:36-14/06 zebrasrv(32) [warn] ir_session (exception)
4. Apply the patch
5. Hit the page again
6. There is nothing in the zebra log file
If you are familiar with analytic records, confirm that you are not
allowed to remove an item that is used in analytical biblio records.
Signed-off-by: Hugo Agud <hagud at orex.es>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit e4b51adb9a46c72099b950b1976c155f3c7d41f1)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit f09fbab4c85c38992a2638d4ce7a9a26ab7c352b
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Mon Jun 18 09:04:19 2018 +0200
Bug 20953: Prevent several discharge requests on OPAC
On OPAC, a user can requested a discharge even if one is already pending.
This generates several pending discharges in staff interface that can not be deleted.
This is because request operation leads to page 'opac-discharge.pl?op=request' and user can refresh this page performing a new request.
Perl code must check that operation is allowed.
Patch reoganised the code so that the following FIXME is obsolete :
'FIXME looks like $available is not needed'
Patch also replaces 'op' arg test to also check undef : input->param("op") // ''
Test plan :
1) Set system preference 'useDischarge' to 'Allow'
2) Choose a patron without checkouts nor fines nor restrictions
3) Log at OPAC and go to patron page /cgi-bin/koha/opac-user.pl
4) Click on 'ask for a discharge' tab
=> You see /cgi-bin/koha/opac-discharge.pl
with text 'What is a discharge? ...'
5) Click on 'Ask for a discharge' link
=> You see /cgi-bin/koha/opac-discharge.pl?op=request
with text 'Your discharge request has been sent ...'
6) In a new browser tab/page, go to intranet on /cgi-bin/koha/members/discharges.pl
=> You see one discharge requets for the patron
7) Come back to OPAC and refresh page
=> You see /cgi-bin/koha/opac-discharge.pl
with text 'Your discharge will be available on this page within a few days.'
8) Come back to intranet and refresh /cgi-bin/koha/opac-discharge.pl
=> There is still one requets for the patron
9) Come back to OPAC and enter URL /cgi-bin/koha/opac-discharge.pl?op=get
=> You see /cgi-bin/koha/opac-discharge.pl
with text 'Your discharge will be available on this page within a few days.'
10) Come back to intranet and refresh /cgi-bin/koha/opac-discharge.pl
=> There is still one requets for the patron
11) Click on 'allow' on patron discharge request
12) Come back to OPAC and refresh /cgi-bin/koha/opac-discharge.pl
=> You see link 'Get your discharge'
13) enter URL /cgi-bin/koha/opac-discharge.pl?op=request
=> You see same page and no new discharge requets is created
14) Come back to intranet on patron details page
15) Remove the discharge restriction
16) Come back to OPAC and refresh /cgi-bin/koha/opac-discharge.pl
=> You see text 'What is a discharge?...'
17) enter URL /cgi-bin/koha/opac-discharge.pl?op=get
=> You see same page and no new discharge requets is created
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 0c07cc533b4b46db8c633d65b72b249f98227acc)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 01ff596b723cde5b577dc16581ee57fee02d5b22
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Fri Jun 15 12:34:51 2018 +0200
Bug 20949: (follow-up) debian/control
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 00b732db48d209908bd1982bbb007678335e7593)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 6d788bcd29f16c77ad88f7fddd308752fd957bb0
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Fri Jun 15 12:10:19 2018 +0200
Bug 20949: Koha depends on Clone
Clone was not declared a dependency before. It used to be a dependency
of Hash::Merge but isn't in the recent version.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit f1a54e09d99eea391b71ceafc291cbca8c838da2)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Installer/PerlDependencies.pm | 5 ++++
Koha/Patron/Discharge.pm | 1 +
admin/preferences.pl | 3 +-
catalogue/detail.pl | 14 +++++----
debian/control | 2 ++
.../prog/en/modules/circ/transfer-slip.tt | 25 ----------------
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 9 +++---
.../bootstrap/en/modules/opac-results-grouped.tt | 6 ++--
opac/opac-discharge.pl | 31 ++++++++++++--------
t/db_dependent/Circulation/Chargelostitem.t | 8 ++---
10 files changed, 49 insertions(+), 55 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list