[koha-commits] main Koha release repository branch master updated. v18.05.00-1360-g4a060e1
Git repo owner
gitmaster at git.koha-community.org
Thu Nov 8 00:29:23 CET 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, master has been updated
via 4a060e18f994d98e6212c8578ab358c54820a97b (commit)
via 07526d897a566c082860120c721bc1c610a24e48 (commit)
via 529d8cd7307cc34ebd1a9a58256ad9ed00e33c42 (commit)
via 973bc0aceba522301217817239f1a9388ffda145 (commit)
via 0bfcac5a079318be7c5d20c6d52af45169eab922 (commit)
via 74198af0fe01035a6fcbf7af75fedcc06f4ae5d8 (commit)
via 474b9a1672b3b62d8c24fe72127bdadd1a11ff3f (commit)
via 9380134a026c3927373557d9bb4cb6d7082a8b7c (commit)
via 9db54580a64ecb8aacbcbe8f65abeb244db7275a (commit)
via fa853f7d38a5addafe21fb3cabdaaa9cc692bb12 (commit)
via 5f0bc6e457f19b889d5f12ee92d6ca5e5effdf42 (commit)
via 5755f30b1b472b5fbf1d8e8fd031efdcd1ed0518 (commit)
via 07d5f76225a3acd905fecf53ccdc4f52474d7ffc (commit)
via db539f4dc0b5f7ceb0726c97c95310d5b853de15 (commit)
via dc43a4b4b3d7cb622bb5c91a25dabf4c5e2ccbdb (commit)
via 5594afb9c29a8b6db2a493330652f8766ae1b53a (commit)
via 4ed7a533ab437a72524f7b3ef660814999fde951 (commit)
via 114c1dfb2c0d8a14ea12e800ab57f1f942d0aa2b (commit)
via b170f77d10bfc05eb346361c8d61819779fdd798 (commit)
via 72750cf3b7001b02237c4145121e1071b2ca65da (commit)
via 633a587213ba59b977d8aa1a2f69f6307ceafae2 (commit)
via f193ce664c2bd32d7ae57656fe8f9e0547098e4a (commit)
via 036d5dd8db0dba26d5a0c540c11f1e414dc33fc1 (commit)
via c0bc29eaf377737663c719dc4ac9fdd25fc608aa (commit)
from e40907a67e6fdcdca6e4eda4c1a74a238275fe1c (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 4a060e18f994d98e6212c8578ab358c54820a97b
Author: Alex Arnaud <alex.arnaud at gmail.com>
Date: Wed Apr 18 14:19:34 2018 +0000
Bug 20602: Use weighted fields in OPAC simple search
Test plan (having Koha working with Elasticsearch):
- apply this patch,
- try searches with and without weight defined on search fields
https://bugs.koha-community.org/show_bug.cgi?id=20262
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 07526d897a566c082860120c721bc1c610a24e48
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 7 23:08:03 2018 +0000
Bug 18316: DBRev 18.06.00.054
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 529d8cd7307cc34ebd1a9a58256ad9ed00e33c42
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 29 14:40:06 2018 +0000
Bug 18316: (QA follow-up) Add final missing filter
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 973bc0aceba522301217817239f1a9388ffda145
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Tue Oct 9 14:27:20 2018 +0000
Bug 18316: (follow-up) remove use_dis_max
It is true by default on ES 5 and has been removed on ES 6
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0bfcac5a079318be7c5d20c6d52af45169eab922
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Sep 4 12:46:30 2018 +0000
Bug 18316: (follow-up) Fix tests and update statement
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 74198af0fe01035a6fcbf7af75fedcc06f4ae5d8
Author: David Gustafsson <david.gustafsson at ub.gu.se>
Date: Fri Jun 1 11:39:45 2018 +0200
Bug 18316: Fix field weight validation/deletion bug
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 474b9a1672b3b62d8c24fe72127bdadd1a11ff3f
Author: David Gustafsson <david.gustafsson at ub.gu.se>
Date: Mon May 21 14:24:36 2018 +0200
Bug 18316: Change search field weight field to decimal
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9380134a026c3927373557d9bb4cb6d7082a8b7c
Author: Alex Arnaud <alex.arnaud at gmail.com>
Date: Mon Apr 23 10:25:14 2018 +0000
Bug 18316: (follow-up) Koha::SearchField::search_marc_maps return a result set - code refactoring for gettings weighted fields - Koha::SearchFields::weighted_fields return a result set
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Rebased-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9db54580a64ecb8aacbcbe8f65abeb244db7275a
Author: Alex Arnaud <alex.arnaud at gmail.com>
Date: Thu Apr 12 16:13:29 2018 +0000
Bug 18316: String changes
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Rebased-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fa853f7d38a5addafe21fb3cabdaaa9cc692bb12
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Mar 21 13:27:12 2018 +0000
Bug 18316: Add weighting/relevancy options to ES query on simple search
The idea is the following: if some search field(s) are weighted in
search engine config page, Koha will query ES on all fields plus those with
the coresponding weights. Else, search is done on the entire record with
no weighting. The advanced search page is unaffected by these changes
Test plan (having Koha working with Elasticsearch):
- apply this patch
- have some weights defined for various fields
- try searches from the search bar and from the advanced search page
- confirm weighting affects the relevancy (in expected ways)
e.g.
1. search for 'a' from advanced search, note results
2. give 'title' a weight
3. search for 'a' using the simple search bar
4. results with 'a' in the title should now be more relevant
- confirm search results on advanced search page are unaffected
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Rebased-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5f0bc6e457f19b889d5f12ee92d6ca5e5effdf42
Author: Alex Arnaud <alex.arnaud at gmail.com>
Date: Thu Mar 29 14:20:59 2018 +0000
Bug 18316: Ability to weight search fields
Weight can be defined between 1 and 99.
only search fields mapped with biblios can be weighted
Test plan:
- apply this patch,
- update schema file (perl misc/devel/update_dbix_class_files.pl),
- go to Administration > Search engine configuration,
- in search fields tab, define weights for some fields and save,
- check weights has been saved,
- reset some weights (empty) and save,
- check weights has been reset
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Rebased-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5755f30b1b472b5fbf1d8e8fd031efdcd1ed0518
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Sep 13 08:41:10 2018 +0200
Bug 21299: (QA follow-up) Rename module and subroutine
See QA request at comment7.
Removing camelcase from subroutinename.
Renaming module to Koha::Util::Navigation (after cmty feedback).
Test plan:
Run t/Koha/Util/Navigation.t.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 07d5f76225a3acd905fecf53ccdc4f52474d7ffc
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 30 12:57:58 2018 +0200
Bug 21299: Introduce localReferer in [opac-]changelanguage.pl
With the work from the former patch, we now have a nice and easy replace..
NOTE: The additional logic in opac-changelanguage.pl is now also applied
to the intranet counterpart (changelanguage.pl). This effectively makes
changelanguage.pl no longer refer to external URLs (as the opac already
did by testing the referer). Might be just theoretical, but consistent.
Test plan:
Test changing language from various OPAC and staff locations.
Include language=[some_language] in the URL before changing language.
[Bonus] Test calling changelanguage.pl from another server. You should no
longer be referred back to the calling server. (See below.)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Added link <a href="[mystaffserver]/cgi-bin/koha/changelanguage.pl?language=en">link</a> somewhere on external server.
Verified that without this patch, it hits the staff server and refers back to the caller. But with this patch, it refers to staff homepage.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit db539f4dc0b5f7ceb0726c97c95310d5b853de15
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 30 12:18:31 2018 +0200
Bug 21299: Add localReferer function to Util module, add test
Before implementing the change in [opac-]changelanguage, we define a new
function (in Koha/Util.pm) and add tests.
Test plan:
Run t/Koha/Util/localReferer.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit dc43a4b4b3d7cb622bb5c91a25dabf4c5e2ccbdb
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 7 21:49:07 2018 +0000
Bug 15494: DBRev 18.06.00.053
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5594afb9c29a8b6db2a493330652f8766ae1b53a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Sep 24 11:06:47 2018 +0000
Bug 15494: (follow-up) Update tests to generate their own data (no delete)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4ed7a533ab437a72524f7b3ef660814999fde951
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Sep 21 20:16:24 2018 +0000
Bug 15494: (follow-up) Move yaml syspref code to its own sub in SySpref object
To test:
1 - prove -v t/db_dependent/Koha/Config/SysPrefs.t
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 114c1dfb2c0d8a14ea12e800ab57f1f942d0aa2b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 2 08:11:55 2018 +0100
Bug 15494: (QA follow-up) Additional polishing
[1] Fix two typos in Circulation.t.
Although the test does not fail, line 2127 contains two typos.
Changing INVISILE to INVISIBLE :)
And type should be itype.
[2] Remove $yaml as leftover from older code.
[3] Add a next when the split on /:/ does not give two results. This will
prevent uninit warnings (although still disabled now in Circulation).
[4] For the same reason we should switch the lines for NULL and empty
string. The undefs you insert should trigger a warn.
[5] The line for empty string should not insert undef, but empty string.
For the same reason adding the condition defined($_) ...
And proving it by adding two tests for the opposite values of
callnumber and itemnotes.
[6] Adding a strip spaces around the fieldname. User friendly..
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b170f77d10bfc05eb346361c8d61819779fdd798
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed May 24 09:47:34 2017 -0400
Bug 15494: Add syspref
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 72750cf3b7001b02237c4145121e1071b2ca65da
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed May 24 09:31:59 2017 -0400
Bug 15494: Update display of renewal errors
To test:
1 - Define a rule to deny renewal
2 - Checkout an item meeting this rule
3 - Attempt renew an item via the OPAC
4 - Attempt renewal via SIP
5 - Attempt renewal via staff client
6 - Verify errors are reasonable
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: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 633a587213ba59b977d8aa1a2f69f6307ceafae2
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed May 24 08:52:27 2017 -0400
Bug 15494: Add _items_denied_renewal sub to C4:Circulation::CanBookBeRenewed
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f193ce664c2bd32d7ae57656fe8f9e0547098e4a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed May 24 08:50:16 2017 -0400
Bug 15494: Unit tests
prove -v t/db_dependent/Circulation.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 036d5dd8db0dba26d5a0c540c11f1e414dc33fc1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Sep 25 10:54:04 2018 -0300
Bug 21408: Enable checkbox on file selection
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c0bc29eaf377737663c719dc4ac9fdd25fc608aa
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Sep 25 10:16:53 2018 -0300
Bug 21408: Inventory - Warn of items possibly scanned out of order
This patch addes the ability to choose to be warned if it's possible
an item was scanned out of order ( i.e. mis-shelved ).
Test Plan:
1) Apply this patch
2) Generate a list of barcodes ordered by callnumber
3) "Misplace" one callnumber by moving it to another area of the list
4) Browse to the inventory tool, choose your barcodes file
5) Check the checkbox for "Check barcodes list for items shelved out of order"
6) Click "submit", note the item has been flagged as possibly out of order
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 29 ++-
C4/SIP/ILS/Transaction/Renew.pm | 1 +
Koha.pm | 2 +-
Koha/Config/SysPref.pm | 27 +++
Koha/Schema/Result/SearchField.pm | 12 +-
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 7 +
Koha/SearchField.pm | 48 +++++
Koha/SearchFields.pm | 15 ++
Koha/Util/Navigation.pm | 87 +++++++++
Koha/Util/SystemPreferences.pm | 69 +++++++
admin/searchengine/elasticsearch/mappings.pl | 25 ++-
catalogue/search.pl | 8 +-
changelanguage.pl | 11 +-
installer/data/mysql/kohastructure.sql | 1 +
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 16 ++
.../intranet-tmpl/prog/en/includes/strings.inc | 1 +
.../en/modules/admin/preferences/circulation.pref | 11 ++
.../admin/searchengine/elasticsearch/mappings.tt | 17 ++
.../prog/en/modules/catalogue/advsearch.tt | 1 +
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 4 +
.../prog/en/modules/tools/inventory.tt | 6 +
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 7 +
.../bootstrap/en/modules/opac-advsearch.tt | 1 +
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 +
misc/cronjobs/automatic_renewals.pl | 3 +-
opac/opac-changelanguage.pl | 22 +--
opac/opac-search.pl | 22 ++-
opac/opac-user.pl | 1 +
t/Koha/Util/Navigation.t | 60 ++++++
t/db_dependent/Circulation.t | 132 ++++++++++++-
t/db_dependent/Koha/Config/SysPrefs.t | 67 +++++++
.../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 56 +++++-
t/db_dependent/Koha/SearchField.t | 202 ++++++++++++++++++++
tools/inventory.pl | 24 ++-
35 files changed, 952 insertions(+), 48 deletions(-)
create mode 100644 Koha/Util/Navigation.pm
create mode 100644 Koha/Util/SystemPreferences.pm
create mode 100644 t/Koha/Util/Navigation.t
create mode 100644 t/db_dependent/Koha/Config/SysPrefs.t
create mode 100644 t/db_dependent/Koha/SearchField.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list