[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.02-19-g07cd656
Git repo owner
gitmaster at git.koha-community.org
Wed Jan 23 14:07:04 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, 18.11.x has been updated
via 07cd6560b5d8334b11ac8c998c1d1156d01a4bcb (commit)
via 4d3510f89ccad4083aeb739f9a738ddc1cbf6741 (commit)
via bccbb54491d3722411cee786000959abade33aa7 (commit)
via 3ed300435b90c29203658a332369cd9895f471a1 (commit)
via 1108795bcd050ce9b6ec6e8de4151bb70e819cb2 (commit)
via 66e041fece11281273d0120fe0f66f2d5901c518 (commit)
via 2b4bf11fa9acc54c87a9e7b5039baf0ecd0ef2d4 (commit)
via b940797800ae4546c455aba7fa6570918a97b6af (commit)
via c494f474ec23b29690ae3eb12310eb282d07c932 (commit)
via 19e98c71a6af40660b7829a5d20bcfcbd8ea51d1 (commit)
via c3f587cb5fed037b784f70527433304c84c0c6aa (commit)
via 2ae4cd4bc9f5faaff9fd8f2bf95bbe127163f4b7 (commit)
via 266b3389b68dd02211a396d4dd16222a5ec3a9f2 (commit)
via e97ce49ba7752b5278c2ea2262401ab6690f211e (commit)
via 2cfff2272e68f483a8054c4d0a96b5304d159d64 (commit)
via 59a38379b246fa3317d2cdea63f036dad0a5e5a3 (commit)
via 3dd7d9dfad0052761e4a3e7a93fce6e7d8055c93 (commit)
via 726c0e4bc4216c3c53780169635987bdc1071720 (commit)
via 2c6b8230b8fa7dd0a7746327c126565fc8b47dc9 (commit)
from 15db01f66e920cefe62b402cd46d66c3f1101a13 (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 07cd6560b5d8334b11ac8c998c1d1156d01a4bcb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 14 16:15:24 2018 -0300
Bug 22006: Handle undefined itemnumber for Koha::Account::Line->item
If there is no item linked to an account line, the ->item method should return undef.
Without this patch it explodes with:
Carp::croak('DBIC result _type isn\'t of the _type Item') called at /home/vagrant/kohaclone/Koha/Object.pm line 102
Exists since the introduction of this method by bug 12001
Reported on bug 19489 comment 18.
Test plan:
prove t/db_dependent/Koha/Account/Lines.t
must return green
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 6c8089b40fef1b59ab056bae8817933afdb2fcc3)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4d3510f89ccad4083aeb739f9a738ddc1cbf6741
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 14 16:14:42 2018 -0300
Bug 22006: Add tests
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 58f04600f084e2bb5306f18bba1b9a0b22e1664b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bccbb54491d3722411cee786000959abade33aa7
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Jan 8 14:32:19 2019 +0100
Bug 22082: ambiguous column in patron stats
In Reports > Patrons statistics, the combination of activity and extended attributes generates an invalid SQL query with error :
ERROR 1052 (23000): Column 'borrowernumber' in IN/ALL/ANY subquery is ambiguous
This is because FROM contains tables borrowers and borrower_attributes both containing borrowernumber column.
Test plan :
1) Be sure to have a patron extended attribute
2) Be sure you have some recent circulation activity
3) Go to Reports > Patrons statistics
4) Select 'active' in 'Patron activity' and 1 years of activity
5) Check 'Row' in 'Patron category'
6) Check 'Columns' in a extended attribute
7) Submit
8) Without patch you have no results, with patch you have exepected results
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 8d2324e6de6f639904d188cd432e14add4874779)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3ed300435b90c29203658a332369cd9895f471a1
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Jan 13 21:26:12 2019 +0000
Bug 22002: (QA follow-up) Remove some debugging code from template
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 1bdf69f49b11c67a751796b53bdad1edb8242eda)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1108795bcd050ce9b6ec6e8de4151bb70e819cb2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Dec 16 11:02:56 2018 -0300
Bug 22002: (bug 21621 follow-up) Re-add GROUP BY in letter.pl and fix it
Caused by
commit 0cffb0f7589aa52d65bda9a8a4934790a141f3a0
Bug 21621: Remove incorrect GROUP BY from tools/letter.pl
The test plan was not complete enough.
Test plan:
1) Go to Home › Tools › Notices & slips
2) Choose a letter to edit, e.g. PREDUE. Note that there is only a
single row.
3) Click the edit button on the notice.
4) Expand the 'Print' section. Put text into the Message subject and
Message body text areas.
5) Click save, this will take you back to the 'Notices & slips' page.
6) Clone PREDUE for a specific library
7) The 'all libraries' option must list the templates for all libraries,
but without duplicate
8) Select a library in the dropdown list: only the templates for the
given library is listed, without duplicate
Signed-off-by: Barton Chittenden <barton at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 99a75aca903eb076d12b46c3546e86d917d1e244)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 66e041fece11281273d0120fe0f66f2d5901c518
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Wed Dec 5 16:27:43 2018 +0200
Bug 21084: Fix automatic truncation in authority search
- Makes token splitting work like in biblio search
- Only adds right hand truncation since that's what Zebra also does
- Only adds truncation if the token is not a phrase and ends in a word character
- Adds tests to existing and new QueryBuilder functions
Test plan:
1. Create an authority record for "Duck, Donald"
2. Try contains type authority searches with the following terms and make sure they find the record:
Duck, Donald
donald duck
don duck
"Duck, Donald"
3. Make sure the following search works but does not find anything:
"Duck, Don"
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 0d9a42b492ca21cc14fab69d0facb80aeb8dcff4)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2b4bf11fa9acc54c87a9e7b5039baf0ecd0ef2d4
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed Jan 2 06:23:57 2019 +0000
Bug 22058: Fix display of empty table cells in OPAC MARC view holdings
I compared the template logic to the MARC detail page in staff.
We use $raw there instead of html, which will also make notes and other
fields with HTML in them display correctly. I am proposing to use the
$raw filter in OPAC as well.
To test:
- Go to the OPAC
- Search for a record with items
- Switch to the MARC view
- Verify empty cells show (html entity for space)
- Apply patch
- Repeat test
- Verify empty table cells now show as empty
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 9a8828850a23d592275ab4d48fae61b89c0a9868)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b940797800ae4546c455aba7fa6570918a97b6af
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 21 13:40:35 2018 +0000
Bug 21491: Display 'Yes' as selected if no refundlostitemfee rules are set
To test:
1 - Delete all refund_lost_item_fee_rules form the db
delete from refund_lost_item_fee_rules;
2 - View the Standard circ rules - Default lost item fee refund shows as
'No'
3 - View circ rules for a single library, shows as 'Default (Yes)'
4 - Return a lost item, it actually does refund (this is in the
LostItemFeeRules code, default 1 if not set)
5 - Apply patch
6 - Rule shows as 'Yes'
7 - View a specifc rule, still says Default (Yes)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 7028cb8aea3f03f120c54269554953ec7475cdd8)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c494f474ec23b29690ae3eb12310eb282d07c932
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Jan 9 15:51:48 2019 +0100
Bug 22085: fix UNIMARC default XSLT broken by Bug 14716
Bug 14716 added a call to encode-uri() and namespace str. This
namespace declaration is sometimes missing in UNIMARC default XSLT
files.
This patch adds namespace declaration also where encode-uri is not used
because it may be used in the future. And those files are the base for
home made custom files.
Test plan :
1) Use a UNIMARC DB
2) Use default in all XSLT sysprefs
3) Apply patch
4) Perform a search on OPAC
5) Check display is OK
6) Click on a record for detail page
7) Check display is OK
8) Perform a search on staff interface
9) Check display is OK
10) Click on a record for detail page
11) Check display is OK
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 76c10a5dcd37666f641fddd43231b32793f55b1b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 19e98c71a6af40660b7829a5d20bcfcbd8ea51d1
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jan 18 20:12:08 2019 +0000
Bug 7143: Fix typo in adding new dev
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 824e9a7c9e3dc2f46043b5a4361d8beb57419d15)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c3f587cb5fed037b784f70527433304c84c0c6aa
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jan 17 02:20:56 2019 +0000
Bug 7143: Update about page for new devs (Academy)wq
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 2bab07458f37de6af078e27b95c4b85bc3422b22)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2ae4cd4bc9f5faaff9fd8f2bf95bbe127163f4b7
Author: Jack Kelliher <jke0429 at stacmail.net>
Date: Tue Jan 15 02:56:23 2019 +0000
Bug 22011: Fixed Typo on batchMod-edit.tt
1. Navigate to tools, then batch item modification.
2. Input a valid barcode into the barcode list input field, and press
continue.
3. Under the Edit items heading, text should display "Checking the box
right next the subfield ..."
4. Apply patch and refresh page, text should now display "Checking the
box right next to the subfield ..."
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 8ae738785d353e3e894259b2745c6168979359ca)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 266b3389b68dd02211a396d4dd16222a5ec3a9f2
Author: Mackey Johnstone <mackeyfj at gmail.com>
Date: Tue Jan 15 02:56:25 2019 +0000
Bug 21637: Fixed upercase letter in EasyAnalyticalRecords syspref
Changed 'Don't Display' to 'Don't display' for the
EasyAnalyticalRecords options.
To find fix:
1.Be loged in as a user who can access sys prefrences.
2.Go to:
Koha Administration > Global System Preferences > Cataloging >
Interface.
3.Confirm that the dropdown option for EasyAnalyticalRecords is now
'Don't display'
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 7009ef624adb1d611c83690f3aa09bfb10cd9f23)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e97ce49ba7752b5278c2ea2262401ab6690f211e
Author: Jasmine Amohia <jasmineamohia.student at wegc.school.nz>
Date: Tue Jan 15 03:30:52 2019 +0000
Bug 22036: Indented code where '^I' was written rather than an indent.
Code was previously written with '^I' where an indent was supposed to
be. I deleted all '^I's and replaced them with indents.
To find this change:
Look at the tags/review.pl file and confirm indentation is correct
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit c29512266dd72991afb6f43e29e37f5db29d0c7b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2cfff2272e68f483a8054c4d0a96b5304d159d64
Author: Jasmine Amohia <jasmineamohia.student at wegc.school.nz>
Date: Tue Jan 15 20:59:16 2019 +0000
Bug 20865: Removed space before : on order receive filters
I removed space before : on order receive filters
To find this change:
1. Create a vendor
2. Create a basket and add an order to basket
3. Close basket and select 'receive shipment'
4. Check that filter options found on the left side of the page finish with a colon and that there is no space before the colon
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 3c328b9cf8d36e39b3c7b56226f746fd597362b0)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 59a38379b246fa3317d2cdea63f036dad0a5e5a3
Author: Olivia Lu <olivialokm at gmail.com>
Date: Tue Jan 15 03:15:37 2019 +0000
Bug 20165: Changed uppercase letter to a lowercase letter in the patron search search fields under the plus option.
Changed "Street Address" to "Street address" in the patron search search
fields under the plus sign to fit Koha's capitalization rules.
To find this change:
1. Go to Patrons and switch in the search to search patrons
2. Click on the plus sign
3. Check "Search fields" pull down
4. "Street Address" should now be "Street address"
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f1748bda4281403629115635dc724e45964707e1)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3dd7d9dfad0052761e4a3e7a93fce6e7d8055c93
Author: helene hickey <hickeyhe at wgc.school.nz>
Date: Tue Jan 15 03:47:58 2019 +0000
Bug 22054: Updated the error message for attempting to renew an onsite checkout
To test:
1) Enable OnSiteCheckouts system preference
2) Checkout an item checking the onsite checkout checkbos in more
options
3) Go to circulation > pending on-site checkouts
4) Verify the checkout shows
5) Go to circulation > renew
6) Try to renew the on-site checkout using the barcode
7) Verify display:
onsite_checkout Continue without renewing
8) apply the patch and reload page with error message
9) verify display:
Item cannot be renewed because it's an onsite checkout
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 4eab8308353948c81d9a05978584073354cb43e5)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 726c0e4bc4216c3c53780169635987bdc1071720
Author: Ethan Amohia <ethan.amohia at gmail.com>
Date: Tue Jan 15 21:45:01 2019 +0000
Bug 22095: Replaced dead links with working links
I have updated the broken link everywhere it occurs.
Confirm that the new link works in the installer.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit dc8e663c9eeb54ebd26ecf9c7d5ef7c953db283c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2c6b8230b8fa7dd0a7746327c126565fc8b47dc9
Author: Olivia Lu <olivialokm at gmail.com>
Date: Tue Jan 15 03:52:30 2019 +0000
Bug 21866: Changed "report" to "plugins" for the warning "This report was written for an older version of Koha. Run at your own risk"
To find this change:
1. Enable use plugins in global system preferences
2. Go to tools then click tool plugins
3. Verify that this string now says plugins
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5e2e101037bb2bfb8579fcee331388e56658db84)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Account/Line.pm | 1 +
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 50 +++--
docs/history.txt | 6 +
.../optional/marc21_holdings_coded_values.sql | 2 +-
.../optional/marc21_holdings_coded_values.txt | 2 +-
.../en/optional/marc21_holdings_coded_values.sql | 2 +-
.../en/optional/marc21_holdings_coded_values.txt | 2 +-
.../optional/marc21_holdings_coded_values.sql | 2 +-
.../optional/marc21_holdings_coded_values.txt | 2 +-
.../facultatif/marc21_holdings_coded_values.sql | 2 +-
.../facultatif/marc21_holdings_coded_values.txt | 2 +-
.../optional/marc21_holdings_coded_values.sql | 2 +-
.../optional/marc21_holdings_coded_values.txt | 2 +-
.../2-Valgfritt/marc21_holdings_coded_values.sql | 2 +-
.../2-Valgfritt/marc21_holdings_coded_values.txt | 2 +-
.../optional/marc21_holdings_coded_values.sql | 2 +-
.../optional/marc21_holdings_coded_values.txt | 2 +-
.../prog/en/includes/patron-search.inc | 4 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 6 +
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 8 +-
.../en/modules/admin/preferences/cataloguing.pref | 2 +-
.../prog/en/modules/admin/smart-rules.tt | 4 +-
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 3 +
.../prog/en/modules/plugins/plugins-home.tt | 2 +-
.../prog/en/modules/tools/batchMod-edit.tt | 2 +-
.../prog/en/xslt/UNIMARCslim2intranetDetail.xsl | 3 +-
.../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 4 +-
.../bootstrap/en/modules/opac-MARCdetail.tt | 2 +-
.../bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl | 3 +-
.../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 3 +-
reports/borrowers_stats.pl | 4 +-
t/Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 86 ++++++++
t/db_dependent/Koha/Account/Lines.t | 5 +-
.../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 28 ++-
tags/review.pl | 220 ++++++++++----------
tools/letter.pl | 2 +
36 files changed, 303 insertions(+), 173 deletions(-)
create mode 100644 t/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list