[koha-commits] main Koha release repository branch master updated. v19.05.00-580-g2bbd811
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 6 14:42:45 CEST 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 2bbd811027172af1adb68f9904071951056ecbda (commit)
via 062c3f9ab2e25b64dad1d4356a976a1416204c05 (commit)
via fafd719dd34aeb4e96377f4404a53df589138efd (commit)
via 0e1e5ca31fab861c85c9b6e0d3b788f0208402d4 (commit)
via 4de5d3dd428a23605e6dc49bfc05bfe780f647dc (commit)
via b946e996ff208e71bbfd5cfb7714f9a656065093 (commit)
via 38322b5a43b37575d4d1c2da1d4b5b0ef3b83bf4 (commit)
via 00c61beff999c12823111fb594bec2c57a5c0d58 (commit)
via aede6896dd6ebc660894bcde117ccd213e2c3de6 (commit)
via 60ce66b6b658bfbe0d9ca459afc673042c7a854f (commit)
via 6b6fe8f88b33e3455ae30526109674bfa4f3d185 (commit)
via d0040dff9f435be65503e88afe45ce196bce9c4a (commit)
via 9215ca42d28bec10f55a9c660bb5816045bb9656 (commit)
via b94b58aa746188ee3699a2e4bc0a6b24d2dd86c5 (commit)
via 66b6c76d96b172bbd2b9f90640f7701a6ba4530c (commit)
via 99d8d2db2c4f44cbb91a069ed3a8dd7894e0218a (commit)
via 4148b222b373b262a16a99faa314a47fa3994c0e (commit)
via 36a16efec36b4c4d57231c0f459f76cb2bbaee7d (commit)
via 1f40de2931f19cce0ca372151444ea05eb5f8e93 (commit)
via 424cd4ed7f877d8bc7a45c77df0fa1b614efd1b7 (commit)
via c1664d3bd6bb613d211695ed603ced868de4cafb (commit)
via 8a99d4adb29a31ddc52b222746c67d70d2636158 (commit)
via 4f42ea51d74325af6282420ef11ba539c784ffd7 (commit)
via 18d8d3b38b367ee0ea10169a0433e4a273252f15 (commit)
from 1fd224ea65dabd53e9f386af3ee602a87c2bb6dd (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 2bbd811027172af1adb68f9904071951056ecbda
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Sep 6 09:47:19 2019 +0000
Bug 16111: (QA follow-up) Few additional corrections
[1] Refining the regex on the format parameter in opac-search.pl
[2] Adding a colon to dc:identifier. The Dublin Core specs gives me this
example:
Identifier="ISBN:0385424728"
[3] Replacing last occurrence of rss2 in the rss template
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 062c3f9ab2e25b64dad1d4356a976a1416204c05
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Sep 6 09:02:38 2019 +0000
Bug 16111: (QA follow-up) Changes related to partial revert
When reverting the & change, we need to go back to html filter for
query_cgi and limit_cgi. In this patch I only replaced it where it is
needed. The template contains more references to SEARCH_RESULT.query_cgi
and SEARCH_RESULT.limit_cgi which are useless, since searchResults does
not return these hash keys at all.
This patch fixes one occurrence where SEARCH_RESULT was copied outside
the loop that defines the template variable.
Obviously, the code for RSS still needs more attention.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fafd719dd34aeb4e96377f4404a53df589138efd
Author: Liz Rea <wizzyrea at gmail.com>
Date: Mon Aug 19 01:51:04 2019 +0000
Bug 16111: Further fixes to the RSS to make feed work
- fixed links per the WC3 spec
- fixed a problem in the ATOM link
To test:
do a search, click the RSS icon - it shows xml in most browsers but wont
do RSS type things.
Apply this patch, restart the things
refresh the page, it should do RSS things (i.e. firefox should render it
as a nice looking thing, rather than raw XML.)
noting that there are a couple of validation errors still, but they
don't seem to be show stopping and moreover I wasn't sure how to fix them:
Misplaced Item
Self reference doesn't match document location (this is a "for widest
compatibility you should fix" kind of thing)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0e1e5ca31fab861c85c9b6e0d3b788f0208402d4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 19 18:24:56 2019 -0400
Bug 16111: [CHANGED] Replace link href by link in rss part
Original patch title: Replace & with &
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
EDIT:
Reverting the changes to C4/Search and opac-search.pl.
This requires a few changes, as supplied in the 5th patch.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4de5d3dd428a23605e6dc49bfc05bfe780f647dc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 19 16:33:06 2019 -0400
Bug 16111: Adjust some more filters
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b946e996ff208e71bbfd5cfb7714f9a656065093
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jun 18 17:31:27 2018 -0300
Bug 16111: Fix content type for RSS feed
Test plan:
GET http://catalogue/cgi-bin/koha/opac-search.pl?idx=kw&q=perl&count=50&sort_by=acqdate_dsc&format=rss2
=> Without this patch it returns content type text/html
=> With this patch it returns text/xml
GET http://catalogue/cgi-bin/koha/opac-search.pl?idx=kw&q=perl&count=50&sort_by=acqdate_dsc&format=rss
=> Without this patch it does not work
=> With this patch it returns text/xml
Bug 16111: Fix atom support
Bug 16111: Remove 'rss2' which should be 'rss' or 'atom'
Bug 16111: Replace <link> with <link href...
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 38322b5a43b37575d4d1c2da1d4b5b0ef3b83bf4
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Sep 6 13:20:14 2019 +0100
Bug 23539: DBRev 19.06.00.024
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 00c61beff999c12823111fb594bec2c57a5c0d58
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Sep 4 13:48:41 2019 -0400
Bug 23539: accountlines.accounttype should match authorised_values.authorised_value in size
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit aede6896dd6ebc660894bcde117ccd213e2c3de6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Sep 1 15:26:02 2019 -0400
Bug 23289: Quote new 'rows' MariaDB reserved word
Since MariaDB 10.2.4 rows is a reserved word:
https://mariadb.com/kb/en/library/mariadb-1024-release-notes/
"""
New reserved word: ROWS. This can no longer be used as an identifier
without being quoted.
"""
Test plan:
With MariaDB >= 10.2.4, create a new label template.
Also, prove t/db_dependent/Labels/t_Template.t
Without this patch you will get the following SQL error: DBD::mysql::st execute failed: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'rows, creator, template_code, page_height,
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>
commit 60ce66b6b658bfbe0d9ca459afc673042c7a854f
Author: Mason James <mtj at kohaaloha.com>
Date: Tue Sep 3 16:02:32 2019 +1200
Bug 23530: Fix cart showing only hidden items
Items hidden with the OpacHiddenItems system preference
were still displayed in the OPAC cart and the normal items
were hidden instead. This patch corrects the display.
To test:
- prep a test bib with hidden and other items using
the OpacHiddenItems system preference
- add bib to cart
- observe that hidden items are displayed - non-hidden items are hidden
- apply patch, reload page
- observe that hidden items are hidden, non-hidden items are displayed
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 6b6fe8f88b33e3455ae30526109674bfa4f3d185
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Jun 22 20:33:45 2019 -0500
Bug 23079: Add tests
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 d0040dff9f435be65503e88afe45ce196bce9c4a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Jun 22 20:40:04 2019 -0500
Bug 23079: Handle invalid timezones when adding/subtracting durations
On Nov 3rd 2019, Brazil will skip from 00:00 to 1:00 (http://www.currenttimeonline.com/dst/dst.do?tz=America/Sao_Paulo), DateTime consider it as an invalid date.
It is a problem when we are playing with dates without the time part (always 00:00).
When we instantiate a DateTime (from dt_from_string) we are already handling this issue, and use the floating timezone (since bug 12669).
The problem remains when we generate a DateTime then add or subtract a duration, which will result in an invalid date:
DateTime->new(year => 2019, month => 12, day => 3, time_zone => 'America/Sao_Paulo')->subtract(days => 30);
=> Nov 3rd 2019, kaboom.
We should replace all the problematic occurrences of dt_from_string->subtract (or ->add)
with dt_from_string(undef, undef, 'floating'), to use the floating timezone and avoid the error.
Actually there are not many of them, I have found only 3 that could
produce real problems.
The other occurrences are:
- in tests => Not a big deal (for now)
- called on a datetime, so it will explode if called at midnight
00:00:00 (and nobody should work at that time).
Test plan:
0/ Define the timezone to 'America/Sao_Paulo' (in your koha-conf.xml file), restart_all
1/ Set a patron's expiry date to Dec 3rd 2019, and
NotifyBorrowerDeparture to 30 (default value)
2/ See the checkouts page for this user
=> Without this patch you get "Invalid local time for date in time zone:
America/Sao_Paulo"
=> With this patch apply the page displays correctly
QA will review the 2 other occurrences.
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 9215ca42d28bec10f55a9c660bb5816045bb9656
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Jun 22 19:29:42 2019 -0500
Bug 22786: Prevent fund creation for locked budgets
If a budget is locked, there is a "New fund for $budget" link that is
disabled but clickable.
We should ensure that the link is not clickable and prevent it at
controller level (do we need it at module level, ie.
Koha::Acquisition::Fund->store?)
Test plan:
- Create a budget, lock it
- Go to /cgi-bin/koha/admin/aqbudgetperiods.pl
- Click on the name of the budget you just created
=> The "New > New fund for $budget_name" button should be disabled
- Click it anyway
=> Without this patch the form to add a new fund is displayed
=> With this patch applied nothing happens
- Hit /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=XXX
With XXX the budget's id
=> Without this patch the form is displayed
=> With this patch applied you get a message:
"The budget is locked, fund creation is not possible."
And you are not able to create a new fund
QA notes:
1. See description
2. The add_validate op can still be forced, let trust librarians with
administration permissions for now.
Signed-off-by: Hayley Mapley <hayleymapley 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 b94b58aa746188ee3699a2e4bc0a6b24d2dd86c5
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 30 12:25:45 2019 +0000
Bug 23518: Problem with borrower search autocomplete
This patch fixes a bug introduced by my patch for Bug 23405: Keyboard
navigation of patron autocomplete results was broken because I
incorrectly assumed that the autocomplete "select" action was redundant
because keyboard navigation would trigger the selected link. It doesn't!
This patch adds the "select" action back to the autocomplete
configuration, explicitly defining a redirect to match the URL which is
followed if the user uses the mouse to click a result.
To test you should have a patron in your database which has no card
number. Make sure CircAutocompl is enabled.
- From the circulation home page, type a patron name in the "Check out"
form and wait for autocomplete search results to display.
- Making a selection from the autocomplete results should work by
clicking with a mouse OR using the arrow keys and TAB or ENTER.
- Test with patrons with and without card numbers.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 66b6c76d96b172bbd2b9f90640f7701a6ba4530c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 5 14:25:51 2019 +0000
Bug 23210: (follow-up) Log in for tags link should trigger modal
This patch modifies the "Log in to add tags" link on the OPAC search
results page, adding the class which is used elsewhere in the OPAC
templates for triggering the login modal.
Also: Removed an unnecessary period.
To test, apply the patch and follow the original test plan. Clicking the
"Log in to add tags" link should trigger the login modal. After logging
in you should be returned to the page you were on.
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 99d8d2db2c4f44cbb91a069ed3a8dd7894e0218a
Author: Lucas Gass <lucas at bywatersolutions.com>
Date: Fri Aug 2 22:21:40 2019 +0000
Bug 23210: login4tags should be a link and included in every search result
TEST PLAN:
1. Make sure TagsEnabled and TagsInputOnList are set to allow.
2. Don't be logged into the OPAC.
3. Make a search and notice the 'Log in to add tags' text is not a link
on the results page.
4. Apply patch
5. Refresh OPAC results page
6. 'Log in to add tags' takes you to the login page.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4148b222b373b262a16a99faa314a47fa3994c0e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 23 14:36:36 2019 +0000
Bug 23397: (QA follow-up) Replace mod 2 by last
Looks better: Maps | Books | Continuing Resources
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 36a16efec36b4c4d57231c0f459f76cb2bbaee7d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Aug 23 13:14:57 2019 +0000
Bug 23397: (follow-up) Split and display itemtypes
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1f40de2931f19cce0ca372151444ea05eb5f8e93
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jul 29 18:12:21 2019 +0000
Bug 23397: Fix grouping of orders in acqui scripts
Bug 21622 attempted to fix some grouping for strict mode, however, it failed to take into account that single order can have multiple item types.
To recreate:
1 - Place an order for 4 copies of a title in acq
2 - Make sure you are creating orders when ordering (AcqCreateItems syspref and/or when creating basket)
3 - Set three items to one type, and one to another
4 - Go to Acqui-Home and click 'ordered' for the used budget
5 - Note the line is duplicated for each itemtype in the order
6 - Recieve the items and note the same issue on 'Spent'
7 - Place another order as before so you have the problem in both ordered.pl and spent/pl
8 - Apply patch
9 - Note orders are no longer duplicated
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>
commit 424cd4ed7f877d8bc7a45c77df0fa1b614efd1b7
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 23 16:41:57 2019 +0000
Bug 23502: Staff client "revert status" buttons should not depend on SuspendHoldsIntranet preference
This bug corrects the template logic controlling the display of the
"Revert waiting status" and "Revert transit status" buttons on the staff
client holds page so that it doesn't depend on having
SuspendHoldsIntranet enabled.
To test, apply the patch and locate a title which has multiple holds,
including:
- One waiting hold
- One in-transit hold
- At least one pending hold
View the page with the SuspendHoldsIntranet preference both on and off.
The "Revert transit status" and "Revert waiting status" buttons should
be displayed either way.
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c1664d3bd6bb613d211695ed603ced868de4cafb
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Sep 6 13:16:44 2019 +0100
Bug 22258: DBRev 19.06.023
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8a99d4adb29a31ddc52b222746c67d70d2636158
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Fri Apr 5 10:29:42 2019 +0300
Bug 22258: Increase Elasticsearch maximum field count to 10000
Increases maximum field count from the default 1000 to 10000 to accommodate large records and MARC as an array.
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4f42ea51d74325af6282420ef11ba539c784ffd7
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Fri Feb 15 13:32:03 2019 +0200
Bug 22258: Elasticsearch: Add array as an alternative MARC format
Adds preference ElasticsearchMARCFormat that controls whether MARC records are stored as ISO2709/MARCXML or array. Array is searchable by field and also indexes all subfields in the _all field for searching.
Test plan:
1. Test that searching and indexing works with the patch without any changes.
2. Switch to array format and index some records.
3. Check e.g. the 008 field of a record and verify that the record can be found with the contents enclosed in quotes.
4. Check that it's possible to search for a specific field/subfield. Search query: marc_data_array.fields.655.subfields.a:Diaries
5. Check that tests still pass, especially t/Koha/SearchEngine/Elasticsearch.t
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 18d8d3b38b367ee0ea10169a0433e4a273252f15
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 6 09:09:18 2019 -0500
Bug 23265: (bug 12063 follow-up) Remove Koha::Holds from updatedatabase
Test plan:
Have a DB that fail the 16.12.00.032 update, then apply this patch and
verify the expiration dates
RM: Please inforce this rule, no use of Koha:: in updatedatabase!
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Creators/Template.pm | 4 +-
Koha.pm | 2 +-
Koha/Patron.pm | 2 +-
Koha/SearchEngine/Elasticsearch.pm | 132 +++++++++++++++++---
Koha/SearchEngine/Elasticsearch/Search.pm | 3 +
acqui/duplicate_orders.pl | 2 +-
acqui/histsearch.pl | 2 +-
acqui/ordered.pl | 4 +-
acqui/spent.pl | 4 +-
admin/aqbudgets.pl | 2 +
admin/searchengine/elasticsearch/field_config.yaml | 3 +
admin/searchengine/elasticsearch/index_config.yaml | 1 +
installer/data/mysql/kohastructure.sql | 2 +-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 43 +++++--
.../prog/en/includes/blocking_errors.inc | 2 +
.../prog/en/includes/budgets-admin-toolbar.inc | 5 +-
.../intranet-tmpl/prog/en/includes/holds_table.inc | 19 +--
.../intranet-tmpl/prog/en/includes/js_includes.inc | 6 +-
.../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 7 +-
.../intranet-tmpl/prog/en/modules/acqui/spent.tt | 7 +-
.../prog/en/modules/admin/preferences/admin.pref | 9 ++
.../bootstrap/en/modules/opac-opensearch.tt | 59 +++++----
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 8 +-
.../bootstrap/en/modules/opac-search-history.tt | 4 +-
opac/opac-basket.pl | 7 +-
opac/opac-search.pl | 7 +-
t/Koha/SearchEngine/Elasticsearch.t | 82 +++++++++++-
t/db_dependent/Koha/Patrons.t | 31 +++--
29 files changed, 362 insertions(+), 98 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list