[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-85-gce63b26
Git repo owner
gitmaster at git.koha-community.org
Sun Jul 15 21:25:54 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, 18.05.x has been updated
via ce63b26b476415f30cecd7be97b52b60c07341d1 (commit)
via 1d6760f01a674ff52d96a1a342d68a7e5c9a6c8a (commit)
via 35fb1fe67cef029201eef6fd53c2d0e4af82195c (commit)
via e4b51adb9a46c72099b950b1976c155f3c7d41f1 (commit)
via 0c07cc533b4b46db8c633d65b72b249f98227acc (commit)
via 00b732db48d209908bd1982bbb007678335e7593 (commit)
via f1a54e09d99eea391b71ceafc291cbca8c838da2 (commit)
via 47e4185c6dce994cdfd5631bafcbc80a5439ee01 (commit)
via 7647f199d47ccc484796c96d0815d1f0e746ab4b (commit)
via c3576b1adedc4dbcabb1eb833f33194f66db63bf (commit)
via 1b01e7db0e19f69ab77660cd3a26b1636a7b01e1 (commit)
via 619d693908b1eb5de3da0d1bb80cc6c3cbf51ab3 (commit)
via 5e98e913dc98ced7167e73932ce865a952db6b1c (commit)
via 7bff14830df7eab4b9a6c57d017846af4f79da5e (commit)
via 73e9c077f6543a4b08f3d2e7394c1e667f0d24e5 (commit)
via 2e237ce6fb02d82fae9d1162bbcfaf9dc2f25bb0 (commit)
via d9a94cc7e5fbcf924a1368423179c7d05fa49c8b (commit)
via 48cecf7935728420567f62214c672c30e5fdfd7a (commit)
via e7501a92aa6b4ca91a55f984443cfcfbeb76a797 (commit)
from b056933a366c46e16d92d36ee3976fa647f31186 (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 ce63b26b476415f30cecd7be97b52b60c07341d1
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>
commit 1d6760f01a674ff52d96a1a342d68a7e5c9a6c8a
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>
commit 35fb1fe67cef029201eef6fd53c2d0e4af82195c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jun 6 14:54:58 2018 +0000
Bug 6647: Label item search should use standard pagination routine
This patch doesn't fix how pagination links are generated for the label
item search results, but it does modify the template so that the
pagination links are styled like they are on catalog search results.
To test, apply the patch and go to Tools -> Labels.
- Open or create a label batch.
- Click "Add items" to trigger the pop-up search window.
- Perform a search which would return multiple results.
- Confirm that the style of the pagination bar matches the one on the
catalog search results page.
- Confirm that current-page number highlighting works correctly.
Signed-off-by: Maryse Simard <maryse.simard 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>
commit e4b51adb9a46c72099b950b1976c155f3c7d41f1
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>
commit 0c07cc533b4b46db8c633d65b72b249f98227acc
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>
commit 00b732db48d209908bd1982bbb007678335e7593
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>
commit f1a54e09d99eea391b71ceafc291cbca8c838da2
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>
commit 47e4185c6dce994cdfd5631bafcbc80a5439ee01
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Mar 13 14:13:10 2017 +0100
Bug 18250: Force startup order in postinst script
This is a workaround meant to correct upgrading installs.
We force the order by disable/enable.
Test plan:
[1] When upgrading an existing install, check that the startup order
after the upgrade has been corrected in /etc/rcX.d (say X=5).
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
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>
commit 7647f199d47ccc484796c96d0815d1f0e746ab4b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Mar 13 13:53:49 2017 +0100
Bug 18250: Update LSB block of koha-common init script
Currently koha-common may start before memcached. We should prevent that.
If we add memcached to the LSB section of the koha-common init script,
Debian's insserv will know about this requirement.
Note: This patch is only a step in resolving the issue.
Test plan:
[1] Copy the updated koha-common script to /etc/init.d
[2] Look for S..koha-common and S..memcached in /etc/rcX.d (say X=5)
[3] Run sudo update-rc.d koha-common disable
[4] Run sudo update-rc.d koha-common enable
[5] Look again for S..koha-common in /etc/rcX.d (say X=5).
The number for koha-common should now be higher than for memcached.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
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>
commit c3576b1adedc4dbcabb1eb833f33194f66db63bf
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Jun 25 14:14:43 2018 +0200
Bug 19502: Add POD for max_result_window
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1b01e7db0e19f69ab77660cd3a26b1636a7b01e1
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Jun 25 14:14:32 2018 +0200
Bug 19502: Remove debug warn
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 619d693908b1eb5de3da0d1bb80cc6c3cbf51ab3
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Jun 5 15:11:34 2018 +0200
Bug 19502: Retrieve index.max_result_window from ES
This avoid hardcoding '10000' in two different places and allow users to
adjust this setting.
Also, this patch fixes a bug when the search return less than 10000
results
Test plan:
1. Do a search that returns 10000+ records.
2. Note the warning above the pagination buttons
3. Go to the last page, no error
4. Change the ES setting:
curl -XPUT http://elasticsearch/koha_master_biblios/_settings -d \
'{"index": {"max_result_window": 20000}}'
5. Do another search that returns more than 10000 but less than 20000
6. Note that the warning does not show up
7. Go to the last page, still no error
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5e98e913dc98ced7167e73932ce865a952db6b1c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Apr 19 23:13:49 2018 +0000
Bug 19502: (follow-up) Pass parameters to avoid making templates depend on search engine
https://bugs.koha-community.org/show_bug.cgi?id=19502
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7bff14830df7eab4b9a6c57d017846af4f79da5e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Mar 16 11:10:37 2018 +0000
Bug 19502: Limit pagination to first 10000 results when using ES
This patch is to avoid hitting an error page. We should eventually make the
max number returned configurable for ES.
To test:
1 - Have Koha running ES with 10,000+ records
2 - Search for '*'
3 - Click 'Last' to view last page of results
4 - 'Cannot perform search' error
5 - Apply patch
6 - Search again
7 - View 'Last' page
8 - No error, you go to the last of 10000
9 - Note the warning above the pagination buttons
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 73e9c077f6543a4b08f3d2e7394c1e667f0d24e5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 29 14:09:07 2018 -0300
Bug 21009: Fix max length of inputs on editing/adding items
There is a "max length" value you can define at framework level to
limit the size of the input. But it is not taken into account on the
add/edit item form.
It is a regression that has been introduced by
commit 47d2de9c024bfb93d56184f298f334b20685cd86
Bug 12176: Remove HTML from additem.pl
max_length vs maxlength
Test plan:
- Define a maximum length for an item subfield
- Add or edit an item
=> Without this patch the maxlength attribute of the inputs are not
defined (maxlength="")
=> With this fix you will see the maxlength attributes correctly set
with the value you defined in the framework
Note:
We could/should set this value to the size of the DB column when mapped
For instance 952$u is mapped with items.uri, which is a varchar(255).
This length restriction should done at framework level
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe 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>
commit 2e237ce6fb02d82fae9d1162bbcfaf9dc2f25bb0
Author: Victor Grousset <victor.grousset at biblibre.com>
Date: Thu Jan 25 14:37:56 2018 +0100
Bug 20084: Fix Industrial2of5 and COOP2of5 patron card layouts
== Test plan ==
This is an oversimplification of a full patron card setup used in production.
1. Create a batch with 1 patron
2. Create a layout and set
the name
"Print card number as barcode"
"Barcode type:" to "Code 39"
3. Create a card template without filling anything
4. Export the batch using the layout and template
5. You should have a white page with a barcode
And no errors in the relevant log file
This show that this setup isn't completely bogus
(although Code 39 is the only type working...)
6. Layout: set "Barcode type:" to Industrial2of5
7. Export the batch
8. You should have a white page with no barcode
And errors in the relevant log file
"Invalid Characters"
This is the bug.
9. Layout: set "Barcode type:" to COOP2of5
10. Export the batch
11. You should have a white page with no barcode
And errors in the relevant log file
"Invalid Characters"
This is the bug.
12. Apply this patch
13. Retry with both non-working patches
1. You should have a white page with a barcode
2. And no errors in the relevant log file
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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>
commit d9a94cc7e5fbcf924a1368423179c7d05fa49c8b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jul 9 13:24:44 2018 +0000
Bug 21054: Remove extraneous </body> tag from sco-main.tt
To test:
1 - Enable sco and setup AutoSelfCheck
2 - Try to use self checkout and print receipt
3 - You shoudl be redirected to the login page
4 - Apply patch and restart all the things
5 - Try to use self checkout and print a receipt
6 - Success!
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>
commit 48cecf7935728420567f62214c672c30e5fdfd7a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 21 18:06:00 2018 -0300
Bug 20979: Fix confirm deletion popup when deleting a biblio
When deleting an empty bib, error messages pops up "1 order(s) are
using this record. You need order managing permissions to delete this
record." even though user has superlibrarian permissions. Prevents the
deletion of the bib record.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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>
commit e7501a92aa6b4ca91a55f984443cfcfbeb76a797
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Fri Jul 6 13:40:53 2018 +0000
Bug 21046: Return the correct borrowernumber when there is empty cardnumber(s)
Test plan:
- Use a patron with an empty cardnumber to authenticate with ILSDI
AuthenticatePatron
(cgi-bin/koha/ilsdi.pl?service=AuthenticatePatron&username=userid&password=pass),
- make sure you have other patron(s) with empty cardnumber and there
borrowernumber is
smaller than the one you authenticate with,
- you should get a wrong borrowernumber,
- apply this patch,
- test again, you should get the right one
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
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>
-----------------------------------------------------------------------
Summary of changes:
C4/ILSDI/Services.pm | 2 +-
C4/Installer/PerlDependencies.pm | 5 ++
C4/Patroncards/Patroncard.pm | 4 +-
Koha/SearchEngine/Elasticsearch/Search.pm | 28 +++++++++++
Koha/SearchEngine/Zebra/Search.pm | 10 ++++
admin/preferences.pl | 3 +-
catalogue/detail.pl | 14 ++++--
catalogue/search.pl | 5 +-
cataloguing/additem.pl | 14 +++---
debian/control | 2 +
debian/koha-common.init | 2 +-
debian/koha-common.postinst | 6 +++
.../prog/en/includes/page-numbers.inc | 1 +
.../prog/en/modules/catalogue/results.tt | 1 -
.../intranet-tmpl/prog/en/modules/labels/result.tt | 53 +++++++++-----------
koha-tmpl/intranet-tmpl/prog/js/catalog.js | 6 +--
.../bootstrap/en/includes/page-numbers.inc | 1 +
.../bootstrap/en/includes/search/page-numbers.inc | 1 +
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 1 -
opac/opac-discharge.pl | 31 +++++++-----
opac/opac-search.pl | 5 +-
t/db_dependent/Circulation/Chargelostitem.t | 8 +--
t/db_dependent/ILSDI_Services.t | 8 +++
.../Koha_SearchEngine_Elasticsearch_Search.t | 15 +++++-
24 files changed, 153 insertions(+), 73 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list