[koha-commits] main Koha release repository branch master updated. v19.05.00-406-g0c4112a
Git repo owner
gitmaster at git.koha-community.org
Fri Jul 26 17:43:37 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 0c4112a200bfdcdbdba4ce7870aeced1f960cfd9 (commit)
via fea1d135be0f7e9ee55ae27f510861fe4c159307 (commit)
via b52a17dade474530103f1b05a2efd39de9879c31 (commit)
via f292b4ff29a0aa1a109c3f1af9c2f5412dd1a5e8 (commit)
via 5d27fb71cbd91fdf196b6568a590f2eef54d7cd1 (commit)
via 2293e6597c69d55ce5916b7a31029f13d65d4fea (commit)
via 0b2a9b5872c72ee6b0f17d32e20c8e59231f03f3 (commit)
via fbeb22802f41f8daf99498303146d1916c851507 (commit)
via c1fe033a116c23192a8ed5ba31924f1f4e032812 (commit)
via 41fa881ba07bb3ad1f8cccef253ed5c9d439f387 (commit)
via 70d7226f9efbbb8633cb054fbc02e0a055aaf917 (commit)
via 81137a17f22bb5352b9f73364ba17369fa7afd58 (commit)
via e75758b18a6dd71cf5298533351f602db0d4ec48 (commit)
via 21d6cd9ef02b21126d43eb7cc9c34e5efb47c730 (commit)
via 859217c1f5c8513bc0bdb8d31b7421e86ad3b355 (commit)
via a72d8dbb0ff3aa6f56aafcca2c3a0c820b5325f6 (commit)
via b43602ee7d2cf5407b987224be8554251a9f80f6 (commit)
from b5e03a8e2bef33a405d3bcaf88c4abd3a019c3c9 (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 0c4112a200bfdcdbdba4ce7870aeced1f960cfd9
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Jul 2 10:58:41 2019 +0100
Bug 23251: Correct formatting of IMD data ending in apostrophe
IMD text data may end in an apostrophe (e.g. dreamin' )
This was causing the segment to be incorrectly formatted
as only the last character was checked, not the preceding
character to check whether it was quoted
add a test for this specific occurence
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fea1d135be0f7e9ee55ae27f510861fe4c159307
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 19 09:55:41 2019 +0000
Bug 23345: Rename include-indexes to exclude-indexes in koha-dump
Trivial edit. The usage statement is wrong.
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 b52a17dade474530103f1b05a2efd39de9879c31
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jun 27 13:24:36 2019 +0000
Bug 23226: Remove type attribute from script tags: Cataloging
This patch removes the "type" attribute from <script> tags one
cataloging and one authorities template.
To test, apply the patch and confirm that examples of affected pages
work properly without any JavaScript errors in the browser console:
- Cataloging -> Cataloging home page
- Cataloging -> Cataloging home page -> Search results
- Authorities -> New authority -> New from Z39.50/SRU
Validating the HTML source of any of these pages should return no errors
related to the "type" attribute.
Signed-off-by: frederik chenier <frederik.chenier at inlibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f292b4ff29a0aa1a109c3f1af9c2f5412dd1a5e8
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jul 26 16:21:58 2019 +0100
Bug 22524: DBRev 19.06.00.015
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5d27fb71cbd91fdf196b6568a590f2eef54d7cd1
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Mon Apr 29 11:03:22 2019 +0300
Bug 22524: Fix date/time-last-modified search with Elasticsearch
Avoid using slash in the field name since it would need to be escaped. Fix conversion of dtlm and any existing mapping.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2293e6597c69d55ce5916b7a31029f13d65d4fea
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Tue Apr 16 16:26:40 2019 +0300
Bug 22524: Fix publication date and year search with Elasticsearch
Also fixes the mappings.yaml to use correct field name (left over issue from bug 19575), so reset mappings and reindex before testing.
Test plan:
1. Reset mappings and reindex biblios.
2. Check that tests in t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t pass.
3. Try that all of the following year range type work in publication date search and year limit in advanced search:
yyyy
yyyy-yyyy
-yyyy
yyyy-
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0b2a9b5872c72ee6b0f17d32e20c8e59231f03f3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Jun 29 10:55:17 2019 -0500
Bug 23217: Remove SQL error when batch patron mod and not attribute selected
On the batch patron modification tool, if no patron attribute is selected then
an UPDATE query will be executed anyway. Indeed the form will send a
an empty "patron_attributes" parameter. We need to handle it.
Test plan:
Go to the patron modification tool
Enter a cardnumber
Change a field (like city)
Do not change anything in the patron's attributes
Save
=> Without this patch a SQL error is generated:
DBD::mysql::st execute failed: Cannot add or update a child row: a foreign key constraint fails (`koha_kohadev`.`borrower_attributes`, CONSTRAINT `borrower_attributes_ibfk_2` FOREIGN KEY (`code`) REFERENCES `borrower_attribute_types` (`code`) ON DELETE CASCADE ON UPDATE CASCADE) [for Statement "INSERT INTO borrower_attributes SET attribute = ?, code = ?, borrowernumber = ?" with ParamValues: 0=undef, 1="", 2="51"] at /home/vagrant/kohaclone/C4/Members/Attributes.pm line 287.
=> With this patch applied you will not see it
You should also test that you can modify patron's attributes ;)
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 fbeb22802f41f8daf99498303146d1916c851507
Author: Liz Rea <wizzyrea at gmail.com>
Date: Thu Apr 25 15:34:36 2019 +0000
Bug 21716: Escape publisher in item search
To prevent endless processing errors.
To test:
* create a biblio with a publisher with a backslash - i.e. 260$b with
graham\lineham
* do an item search that will include that title in the results
* wait forever, because it won't work.
* apply this patch
* repeat steps, notice that you
a. get results
b. your result is listed with it's correct publisher
* rejoice
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 c1fe033a116c23192a8ed5ba31924f1f4e032812
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jul 26 16:13:20 2019 +0100
Bug 11573: DBRev 19.06.00.014
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 41fa881ba07bb3ad1f8cccef253ed5c9d439f387
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 26 12:31:39 2019 +0000
Bug 11573: (QA follow-up) Correct spelling typo
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 70d7226f9efbbb8633cb054fbc02e0a055aaf917
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jul 26 12:52:44 2019 +0100
Bug 11573: (follow-up) Handle daily rental in db update
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 81137a17f22bb5352b9f73364ba17369fa7afd58
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jun 4 11:37:13 2019 +0100
Bug 11573: (follow-up) Correction to accountype search on opac-user.pl
With the update of accountype from 'Rent' to four distinct accountypes
we need to update the search here to catch all four types of charge.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e75758b18a6dd71cf5298533351f602db0d4ec48
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Apr 24 10:35:22 2019 +0100
Bug 11573: Update of unit tests
This patch updates the unit tests to reflect the changes to the core
routines. The relevant changes are the removal of a hard coded
'description' and the splitting up of the 'Rent' accounttype into
'RENT', 'RENT_RENEW', 'RENT_DAILY' and 'RENT_DAILY_RENEW'.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 21d6cd9ef02b21126d43eb7cc9c34e5efb47c730
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Apr 24 09:05:33 2019 +0100
Bug 11573: Update existing accountlines for 'Rent'
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 859217c1f5c8513bc0bdb8d31b7421e86ad3b355
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Apr 23 18:05:05 2019 +0100
Bug 11573: Make rental accountlines translatable
To test:
1. Set up an item type with a rental charge
2. Issue an item with that item type
3. Check fines, a charge of type 'Rent' will be visible with a
description of 'Rental'.
4. Renew the item
5. Check fines, a charge of type 'Rent' will be visible with a
description of 'Renewal of Rental Item TITLE BARCODE' where TITLE and
BARCODE are the items title and barcode.
5. Apply the patch
6. Repeat steps 1-4, charge descriptions should now be empty and charge
types should display 'Rental fee' and 'Renewal of rental item'.
7. Repeat steps 1-6 for an item type with a daily rental charge and note
the charge types are now 'Daily rental fee' and 'Renewal of daily rental
item'
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a72d8dbb0ff3aa6f56aafcca2c3a0c820b5325f6
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu Jun 6 17:05:24 2019 +0200
Bug 22249: Mana - Move comment process in a dedicated sub
Test plan:
- Go to a subscription's detail page,
- click on "Report mistake" => "New comment",
- check Koha logs file,
- you can see the following warning:
Can't locate object method "find" via package "Koha::Resource_comments"
- Apply this patch,
- same test again,
- no wraning
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b43602ee7d2cf5407b987224be8554251a9f80f6
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jul 15 15:06:14 2019 +0100
Bug 23316: (follow-up) for bug 22521 to fix GetFine
We changed the way we classify fines with bug 22521 but missed one
instance.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.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/Circulation.pm | 18 +++---
C4/Overdues.pm | 2 +-
Koha.pm | 2 +-
Koha/Account.pm | 29 ++++++----
Koha/Edifact/Order.pm | 2 +-
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 14 ++++-
Koha/SharedContent.pm | 23 ++++++--
admin/searchengine/elasticsearch/mappings.yaml | 4 +-
debian/scripts/koha-dump | 2 +-
installer/data/mysql/updatedatabase.pl | 58 ++++++++++++++++++++
.../intranet-tmpl/prog/en/includes/accounts.inc | 43 ++++++++-------
.../en/includes/catalogue/itemsearch_item.json.inc | 3 +-
.../prog/en/includes/mana/mana-comment-status.inc | 1 -
.../prog/en/modules/cataloguing/addbooks.tt | 2 +-
.../en/modules/cataloguing/z3950_auth_search.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/js/mana.js | 15 +++--
.../bootstrap/en/includes/account-table.inc | 45 ++++++++-------
opac/opac-user.pl | 2 +-
svc/mana/share | 32 ++---------
t/Ediorder.t | 13 ++++-
t/db_dependent/Circulation.t | 29 ++++------
t/db_dependent/Circulation/Returns.t | 2 +-
t/db_dependent/Circulation/issue.t | 2 +-
.../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 38 ++++++++++++-
t/db_dependent/Koha/SharedContent.t | 6 +-
tools/modborrowers.pl | 1 +
26 files changed, 253 insertions(+), 137 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list