[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.04-95-g828a9ec
Git repo owner
gitmaster at git.koha-community.org
Fri Nov 15 12:24:11 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, 19.05.x has been updated
via 828a9ecd2983f9117af3852dbf834f09bfd0471e (commit)
via 37e997a9a7635510d5c5923bde59fd836b225c0c (commit)
via a25bd1daa5213ebdd9487e056b6cb5eb66055739 (commit)
via 5eb36ad98e95147a937422f5e15f72c352b6edaa (commit)
via 66d06a969f833f84fa2eed77bd6b21cf58b367c1 (commit)
via e9677582b32ceca19d785a32ac494e52ab66bd26 (commit)
via e6703246a439d3e530b6b4e7cf953ff293ff24c2 (commit)
via 1d12cf31bad3df6a95ed2d9765d7614ae9c0e1ee (commit)
via 61c2a4eddc68d48e44eb6dc644795135f4216c52 (commit)
via de8251ec23c9802bccdefc8092f529e5aa1d8262 (commit)
via 3df5df6c749fc806c1ca8312834c6dd01446503d (commit)
via affbc2aa3efa0c3907b2b4205a285eac1af03a0d (commit)
via 1951713fb4bbb76076501a0791726588af6d875c (commit)
via fa3c5b6e53c295252f89362ed3c276657a30efb6 (commit)
via 4fca42384ad07d0e1f2c960cdcd257d48feb1f33 (commit)
via 2e3c8148ea29e6444ab94b92f3c215ada12122ea (commit)
via 016f79c747c48904fd9a1042432c3b11d463bc95 (commit)
from f732498cb7c689ac8974153afb6307c598658f20 (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 828a9ecd2983f9117af3852dbf834f09bfd0471e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 12 18:18:23 2019 +0100
Bug 23846: Handle exception gracefully at the OPAC
I do not think we should have the same trick as the intranet, and
display a message. This should be enough.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit cce358f9af5ee9761a875816f603344873838359)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 37e997a9a7635510d5c5923bde59fd836b225c0c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 12 11:15:46 2019 +0100
Bug 23846: Add a check to the data inconsistencies script
This may be quite long for big catalogue, but I think it is a good one
to have.
Test plan:
Same as first patch, then execute search_for_data_inconsistencies.pl
Notice the error.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 1e1c5d17a268c6d493c2c71d4b456da7749655c3)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit a25bd1daa5213ebdd9487e056b6cb5eb66055739
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 12 11:04:42 2019 +0100
Bug 23846: Display degraded view when MARCXML is invalid (staff detail)
When an invalid bibliographic record is imported into the catalogue
there is not warning or error. However the bibliographic record detail
page will explode (Koha::Biblio::Metadata->record will raise an
exception).
This patch proposes to catch the exception on this view and display a
warning about the situation.
Note that editing/saving the record will fix the MARCXML data and so
removes the warning (some black magic we should get rid of I suspect).
Test plan:
- Import a bibliographic record with invalid XML, you can add non
printable characters, like 0x1F (CTRL-V 1F with vim)
- Go to the detail page
=> Without this patch you get a 500
=> With this patch applied you get a "degraded view" with a warning
message, telling you what the error is.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 068943f18d60edc231b59b6232fecabaf1c799ab)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 5eb36ad98e95147a937422f5e15f72c352b6edaa
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Nov 7 19:38:24 2019 +0000
Bug 23986: Pass strings to Catmandu for deletion
The deletion subroutine expects to get a string, this is fine in most places, but when
we sort our records for batch deletion they are cast to numbers and the delete is not processed.
This patch quotes the biblionumbers as strings before passing them to Catmandu
To aid in detecting orphaned records you can use the patches on bug 22831
To test:
1 - Have or create a bib
2 - Go to Tools->Batch record deletion
3 - Click 'Enter a list of record numbers'
4 - Enter the biblionumber'
5 - Confirm deletion
6 - Search for the record, it still appears
7 - Apply patch, restart all the things
8 - Repeat 1-6
9 - This time the record is deleted
10 - Test other methods of record deletion to confirm the record is removed
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit cdea121ddb5c3e609ce698171a8dc319593a7780)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 66d06a969f833f84fa2eed77bd6b21cf58b367c1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 22 11:36:28 2019 +0200
Bug 23851: Add the homebranch prefix to the barcode when adding multiple copies of an items
See the comment in the code for more information.
Test plan:
- Set autoBarcode to hbyymmincr
- Create an item and click on the barcode field
- A barcode prefixed by the homebranch is generated
- Click the "Add multiple copies of this item" and enter 4
- Save
=> Without this patch only the first item has the homebranch prefix
=> With this patch applied they all have a barcode in the same format
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit aae3dfe1232d8df452c7e677c6fa443017fb0417)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit e9677582b32ceca19d785a32ac494e52ab66bd26
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 4 12:25:33 2019 +0100
Bug 23933: (bug 10132 follow-up) Fix commit_file.pl
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 0eb9edbf229bdbde02ff65e5f955fb18cf0cc7db)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit e6703246a439d3e530b6b4e7cf953ff293ff24c2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Nov 8 09:00:32 2019 +0000
Bug 22857: (QA follow-up) Cosmetic changes: typo, whitespace
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit bd30a17d3bc0040460543ced27140690f50d27f0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 1d12cf31bad3df6a95ed2d9765d7614ae9c0e1ee
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 5 11:23:04 2019 +0100
Bug 22857: Sync koha-conf.xml files
Missing entries are added to those files.
Test plan:
Search for typos
Compare the two files and comfirm the entries are the same in both.
Exception: supportdir exists in etc/koha-conf.xml only, but I think it's
obsolete.
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit eaf4b79c32a6f173db8177b8ee365ec10f4532a6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 61c2a4eddc68d48e44eb6dc644795135f4216c52
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Oct 25 11:31:46 2019 +0000
Bug 23529: (QA follow-up) Fix closing bracket, add label
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 70a59fc694866154fce74eeaf08ee2126f34947f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit de8251ec23c9802bccdefc8092f529e5aa1d8262
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Oct 24 12:26:44 2019 +0100
Bug 23529: (follow-up) Fix syntax error
As mentioned by Magnus in comment #8
Sorry Magnus, definitely fixed this time!
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 370ee3203e2325f6f5db6771775ac4b55d82c874)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 3df5df6c749fc806c1ca8312834c6dd01446503d
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Mon Sep 2 09:29:14 2019 +0100
Bug 23529: Narrow scope of changed
Whilst working on something else, it came to light that the previous fix
in bug 23229 was waaaaay too heavy handed and basically kills all ILL
related JS :( This is obviously a big problem, this patch fixes that.
The main problem is that all the ILL related JS is in a single file,
which isn't ideal as bits of it are used on different pages. Ideally,
we'd refactor it out into more manageable chunks which can be included
as required. Until such a time, this patch will do, it just prevents the
"get all requests" AJAX request unless you're on the ILL list page.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 04e9885c0f18fda2363818d4b0f2453a3aff4923)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit affbc2aa3efa0c3907b2b4205a285eac1af03a0d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Nov 4 13:25:19 2019 +0000
Bug 23963: Revert bug 21987 to restore image quality
Bug 21987 had unexpected effects upon image quality for thumbnails.
Currently, we are working to resolve those issues but have not managed
to correct them inside the release window for this cycle. As such, I
have chosen to revert the original bug whilst we work on a resolution.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 35670b0495e0333f57773b0375ea7aa1122d5372)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 1951713fb4bbb76076501a0791726588af6d875c
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Nov 15 11:13:15 2019 +0100
Revert "Bug 21987: Add tests"
This reverts commit afb39b132b10b74efec31cd8191cdcd72a61d8d3.
commit fa3c5b6e53c295252f89362ed3c276657a30efb6
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Nov 15 11:13:14 2019 +0100
Revert "Bug 21987: Do not generate true color thumbnails if not needed"
This reverts commit 5c41d584cb654efbfd8c854bac0d30d87a054ab5.
commit 4fca42384ad07d0e1f2c960cdcd257d48feb1f33
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Nov 15 11:13:14 2019 +0100
Revert "Bug 21987: (RM follow-up) Add text for simple tests"
This reverts commit 1464328718619a673f233406fdb238f0391b0785.
commit 2e3c8148ea29e6444ab94b92f3c215ada12122ea
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 6 10:59:26 2019 +0100
Bug 23467: Exit after output_html - opac-reserve.pl
To avoid double screen
There are several ways to recreate the issue, the easiest is:
/cgi-bin/koha/opac-reserve.pl?biblionumber=
You should see "ERROR: No record id specified."
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit a4f2ad76f98e023489dec44f481f290302f44c78)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 016f79c747c48904fd9a1042432c3b11d463bc95
Author: Lari Taskula <lari.taskula at hypernova.fi>
Date: Mon Nov 4 16:32:58 2019 +0000
Bug 23774: Server-side confirmation for hold pickup location in OPAC
While placing a hold on a book, if a user opens up Inspect Element on the
Pick up location drop down box they can change the pick up location in
the code to a library that is not listed as a pick up location.
How to replicate:
Search for a book
Select book
Click Place Hold
On the screen Home > Placing a hold
Right click on Pick up location
Select 'Inspect Element'
Under
<!-- HOLDABLE -->
<li class="Branch">
<select name="Branch ******"> Pick Up location:</label>=$0
Option values are listed that relate to the pick up location, this value
can be changed to another new location and when the hold is placed
the hold will be placed for this new location instead of the listed options
in the Pick up location drop down list.
To test:
1. Apply patch
2. Repeat "How to replicate"
3. Observe it is no longer possible to place holds on libraries not defined
as pickup location by changing option value via Inspect Element tool
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 45a89f47090e783513841a087256c76fff84b29f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/AuthoritiesMarc.pm | 3 +-
C4/Images.pm | 4 +-
Koha/SearchEngine/Elasticsearch/Indexer.pm | 2 +-
catalogue/detail.pl | 9 ++++-
cataloguing/additem.pl | 12 +++++-
debian/templates/koha-conf-site.xml.in | 11 ++++++
etc/koha-conf.xml | 16 ++++++++
.../prog/en/modules/catalogue/detail.tt | 6 +++
.../prog/en/modules/ill/ill-requests.tt | 6 +--
koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js | 15 +++++---
.../maintenance/search_for_data_inconsistencies.pl | 14 +++++++
opac/opac-detail.pl | 4 +-
opac/opac-reserve.pl | 9 ++++-
t/db_dependent/Images.t | 39 --------------------
14 files changed, 92 insertions(+), 58 deletions(-)
delete mode 100644 t/db_dependent/Images.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list