[koha-commits] main Koha release repository branch master updated. v17.11.00-99-g03dd826
Git repo owner
gitmaster at git.koha-community.org
Mon Dec 11 18:56:22 CET 2017
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 03dd8267575559caadcc892a488ed74cd7c35e2b (commit)
via bc900d81c555bd133c40b859bda390c1592e0e71 (commit)
via 8dd884f13869036ce666cf5a5b430aaa62065df0 (commit)
via 22d708894b31d63fbac23df65eeb7d6597e6af61 (commit)
via a0e44e192003541c2132c94df92cf8372ec30b92 (commit)
via f57c3b36ea55612d81da7eaa8f75efe9126f9703 (commit)
via 0ab5a3cf929505a393060f212a4a0399abd9245d (commit)
via 9125722e38e330a0c45b56844d0aac583509f67f (commit)
via 20b8568a998264b874bd9baa884ed11cce1e7223 (commit)
via 203ddfd9edf69d86d0f6b930c4be292bbbe4b25b (commit)
via e1ba8d344ddfff53d24fa6b3a1966e17bdd13a7c (commit)
via db776c34d23ddd0d4a78e83a983d5b0c906c188a (commit)
via 963eaeab7bda800ca8bbc123d94a7b4ccaa9de0c (commit)
via 34cdd536cb16436b407947eecd6975b8d4f44467 (commit)
via ff9a69ccbd61f862965094ac2332874d895aef11 (commit)
from ad2bd6a36dd48626bf64834fee6a800f85d7665c (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 03dd8267575559caadcc892a488ed74cd7c35e2b
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Dec 8 15:31:49 2017 +0100
Bug 17182: (QA follow-up) Fix call to GetMarcBiblio
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bc900d81c555bd133c40b859bda390c1592e0e71
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jul 19 14:10:05 2017 +0000
Bug 17182: Allow Keyword to MARC mapping for acquisitions searches
This patchset adds the 'subtitle' field to the results display on
acquistions search for adding an order form an existing item.
Any field mapped to 'subtitle' in 'Keyword to MARC mapping' will be
fetched and displayed in the results
To test:
1 - Perform an acquisitions search for existing record
2 - Note record subtitles are not displayed
3 - Map 245$b and 245$n to 'subtitle' in 'Keyword to MARC mapping'
4 - Note they are still not displayed ion acq results
5 - Apply patch
6 - subtitle fields should now display
Sponsored by: Round Rock Public Library
<https://www.roundrocktexas.gov/departments/library/>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8dd884f13869036ce666cf5a5b430aaa62065df0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 11 14:28:26 2017 -0300
Bug 19542: Use comma to separate indices
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 22d708894b31d63fbac23df65eeb7d6597e6af61
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Dec 7 15:35:42 2017 +0000
Bug 19542: (QA follow-up) Remove debug warn
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a0e44e192003541c2132c94df92cf8372ec30b92
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 31 11:29:28 2017 -0300
Bug 19542: Add Elasticsearch information in the 'About' page
This patch adds Elasticsearch related information to the 'About' page.
The information is gathered and displayed only when the 'SearchEngine' syspref
is set to 'Elasticsearch'. It displays configured nodes, and the status:
- Running
- Not running
In case it is running, it displays the defined indices and the document count on each.
If there are configuration problems, exceptions are catch and a convenient warning
message is displayed.
To test:
- Apply this patches
- Run:
$ kshell
k$ prove t/Koha/SearchEngine/Elasticsearch.t
=> SUCCESS: Tests pass!
- Have ES configured in your koha-conf.xml file (by default in kohadevbox)
- Set the 'SearchEngine' syspref to 'Elasticsearch'
- Comment out pieces of the elasticsearch-specific entries (server, index_name,
the whole elasticsearch block). Reload on each change.
=> SUCCESS: Warning messages are displayed and make sense in the context of your changes.
----> the rest of the tests require having ES running on the dev env. This can be easily
achieved by creating the kohadevbox using:
$ KOHA_ELASTICSEARCH=1 vagrant up
- Stop the 'elasticsearch' service:
$ sudo service elasticsearch stop
- Reload about.pl
=> SUCCESS: The configured nodes are displayed, and the status is 'not running'
- Start the 'elasticsearch' service:
$ sudo service elasticsearch start
- Reload about.pl
=> SUCCESS: The configured nodes are displayed, the status is 'running' and
created indices info is displayed, along with the document count
on each index.
- Sign off :-D
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f57c3b36ea55612d81da7eaa8f75efe9126f9703
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 31 11:26:36 2017 -0300
Bug 19542: Add a check for ES configuration health
This patch adds a new statuc function to Koha::SearchEngine::ElasticSearch
which is instended to replace most of get_elasticsearch_params. This function
reads the configuration from C4::Context->config('elasticsearch') and raises
relevant exceptions when mandatory entries are missing.
Its behaviour is covered by tests.
To test:
- Run:
$ kshell
k$ prove t/Koha/SearchEngine/Elasticsearch.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0ab5a3cf929505a393060f212a4a0399abd9245d
Author: David Bourgault <david.bourgault at inlibro.com>
Date: Mon Sep 25 13:05:01 2017 -0400
Bug 11210: Writeoff partial amounts
Minor changes to pay.pl and paycollect.tt to allow writing off a partial amount of a fine.
Test plan:
0) Go to the Fines tab of a test patron's profile
1) Create a fine if there are none (under the Manual invoice tab)
2) Go to the "Pay fines" tab
3) Press the write off button on the corresponding account line
Without patch, you'll be asked to confirm, but will not be able to edit the amount
With patch, you'll be able to edit the amount.
Followed test plan, patch worked as described. Also ran QA test tool and
modified files passed
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9125722e38e330a0c45b56844d0aac583509f67f
Author: Claire Gravely <claire.gravely at bsz-bw.de>
Date: Thu Dec 7 07:35:37 2017 +0000
Bug 19769: 'Pickup library is different' message does not display library branch name when placing hold
When placing a hold for a patron whose pickup library and home library
are different, the message displayed only shows the branch code and not
the branch name.
This patch displays the branch name as well as the branch code.
To test:
1. Search for an item
2. Click 'place hold'
3. Enter patron name/card number for a patron whose home library is
different to the item's
4. Note the message displayed only shows the branch code but not the
name
5. Apply Patch
6. Repeat 1-3
7. Message should now also display the branch name
https://bugs.koha-community.org/show_bug.cgi?id=19769
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 20b8568a998264b874bd9baa884ed11cce1e7223
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 4 16:07:52 2017 -0300
Bug 19746: Remove debug statements in returns.pl
From bug commit bb6277ffcc593685554112d770ac273c9efeda33
Bug 14464: Add ability to cancel waiting holds from checkin screen
+use Carp 'verbose';
+$SIG{ __DIE__ } = sub { Carp::confess( @_ ) };
See also
http://lists.koha-community.org/pipermail/koha-devel/2017-November/044168.html
Test plan:
Read the changes and make sure they make sense
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 203ddfd9edf69d86d0f6b930c4be292bbbe4b25b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 26 15:41:47 2017 -0300
Bug 3841: Add the ACQ framework for new installations
This patch adds the acquisition frameworks (frameworkcode=ACQ) for new
installations.
It copies the 952 (MARC21) or 995 (UNIMARC) fields from the default
framework (frameworkcode='')
Test plan:
Create a new installation and make sure the ACQ framework exists.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e1ba8d344ddfff53d24fa6b3a1966e17bdd13a7c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Nov 17 12:13:55 2017 +0000
Bug 19563: (follow-up) Restore checking sort variable
This code seems a bit odd, $self->sort_fields()->{$name} is checking if
there is any mapping in ES for a field, so if one marc field in an index
is marked as sortable this will exists. We need to check the individual
marc field to see if it should be added to the sort index here.
If you apply the first patch, reindex, and view a record in es:
curl -XGET 'localhost:9200/koha_kohadev_biblios/data/19/?pretty' | grep
-A 10 author__sort
You will see that 245$c is included in the record without that
additional check
Apply this, reindex again, and that field should not be included
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit db776c34d23ddd0d4a78e83a983d5b0c906c188a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Nov 17 12:12:32 2017 +0000
Bug 19563: Unit tests
To test:
1 - Apply first patch and this patch
2 - prove -v t/db_dependent/Koha_Elasticsearch.t
3 - New tests will fail
4 - Apply followup patch
5 - Tests shuld pass
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 963eaeab7bda800ca8bbc123d94a7b4ccaa9de0c
Author: David Gustafsson <david.gustafsson at ub.gu.se>
Date: Thu Nov 2 13:44:13 2017 +0100
Bug 19563: Generation of sort_fields uses incorrect condition
Fix incorrect condition for if clause for generating <field>__sort mappings
for Elasticsearch. Also remove redundant check for same condition when
generating fixer rules.
Test plan:
1. Inspect current mappings for example by viewing: http://<elasticsearch_host>:9200/koha_<koha_instance_name>_biblios/_mapping.
2. If using the default configuraion only "author" has a sort field (author__sort).
4. Appy patch.
5. Reindex using rebuild_elastic_search.pl.
6. All fields except those with sort sort set to "0" should now have sort fields, which in the default configuration is all but "author".
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 34cdd536cb16436b407947eecd6975b8d4f44467
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 11 13:57:39 2017 -0300
Bug 10021: Only display outstanding fines in 'Pay fines'
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ff9a69ccbd61f862965094ac2332874d895aef11
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 11 13:32:09 2017 -0300
Bug 10021: Remove notify headers from pay*.tt
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
Koha/Exceptions/Config.pm | 16 ++++
Koha/SearchEngine/Elasticsearch.pm | 74 +++++++++++++++--
about.pl | 65 +++++++++++++++
acqui/neworderbiblio.pl | 1 +
circ/returns.pl | 3 -
.../optional/marc21_simple_bib_frameworks.sql | 8 ++
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 8 ++
.../optional/marc21_simple_bib_frameworks.sql | 8 ++
.../Optionnel/marc21_simple_bib_frameworks.sql | 6 ++
.../Obligatoire/framework_DEFAULT.sql | 8 ++
.../Obligatoire/framework_DEFAULT.sql | 8 ++
.../optional/marc21_simple_bib_frameworks.sql | 8 ++
.../optional/marc21_simple_bib_frameworks.sql | 6 ++
.../unimarc_bibliographic_DEFAULT_general.sql | 8 ++
.../marc21_bibliographic_DEFAULT_general.sql | 8 ++
.../unimarc_bibliographic_DEFAULT_general.sql | 8 ++
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 26 ++++++
.../prog/en/modules/acqui/neworderbiblio.tt | 1 +
.../prog/en/modules/members/paycollect.tt | 23 +++---
.../prog/en/modules/reserve/request.tt | 2 +-
members/pay.pl | 4 +-
t/Koha/SearchEngine/Elasticsearch.t | 86 ++++++++++++++++++++
t/db_dependent/Koha_Elasticsearch.t | 17 +++-
23 files changed, 375 insertions(+), 27 deletions(-)
create mode 100644 Koha/Exceptions/Config.pm
create mode 100644 t/Koha/SearchEngine/Elasticsearch.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list