[koha-commits] main Koha release repository branch master updated. v19.05.00-1241-g89931b4
Git repo owner
gitmaster at git.koha-community.org
Wed Nov 6 18:33:40 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, master has been updated
via 89931b4bb02d6ca1796ece2647fc6104382c0b7d (commit)
via a4f2ad76f98e023489dec44f481f290302f44c78 (commit)
via 45a89f47090e783513841a087256c76fff84b29f (commit)
via 4a36c1ac044ed9da3b67d32e9c315e61d2adc3bd (commit)
via 33595e1a3edd881e6b5489894c4676293839ed19 (commit)
via 4c0786a1106ed170cbf80f0ebf71599b7ac9d3e9 (commit)
via 42ebef689fb45255613381a4d176977cddc9dc9d (commit)
via 1e47e5a849fb0297f7da1a5ebd5d94f5b8cd46f9 (commit)
via a1161ced1d977d872ab4238fc38ae30440978204 (commit)
via b920cb708b8acacbf2075b00c0c68e70b6d5a29b (commit)
via 5b03d4be39497be0dbdce17ef26867ca80affec1 (commit)
via c58fc50128eff5d23ac7e9c71b6f78da3bba3c71 (commit)
via cffa7623e13d8a21e66f5c9dc8caaa5668738411 (commit)
via d5c501bf63f9d42bc9d872eef391c0864753c8ba (commit)
via fad70512c0d6ebe72f34848406e00d9eb927930b (commit)
from e395844982d952d627dd40180f38303c50eb5402 (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 89931b4bb02d6ca1796ece2647fc6104382c0b7d
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Nov 3 22:48:04 2019 +0000
Bug 23483: Show the description, not the patron's title when writing off an individual fine/fee
When writing off an individual fine, the description shown
was the patron's title, instead of the fine description.
Fixing it by changing it to the same template variable used for
paying individuals so they match up.
To test:
- Pick a patron and make sure salutation is set (Mr, Mrs, ...)
- Create a manual fine
- For the fine, compare the description shown when using the Writeoff
and Pay buttons next to the fine
- Verify the display is different and writeoff displays the salutation
- Apply patch
- Repeat, descriptions now should match up
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a4f2ad76f98e023489dec44f481f290302f44c78
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 6 10:59:26 2019 +0100
Bug 23467: Exit after output_html - opac-reserve.pl
To avoid double screen
There are several ways to recreate the issue, the easiest is:
/cgi-bin/koha/opac-reserve.pl?biblionumber=
You should see "ERROR: No record id specified."
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 45a89f47090e783513841a087256c76fff84b29f
Author: Lari Taskula <lari.taskula at hypernova.fi>
Date: Mon Nov 4 16:32:58 2019 +0000
Bug 23774: Server-side confirmation for hold pickup location in OPAC
While placing a hold on a book, if a user opens up Inspect Element on the
Pick up location drop down box they can change the pick up location in
the code to a library that is not listed as a pick up location.
How to replicate:
Search for a book
Select book
Click Place Hold
On the screen Home > Placing a hold
Right click on Pick up location
Select 'Inspect Element'
Under
<!-- HOLDABLE -->
<li class="Branch">
<select name="Branch ******"> Pick Up location:</label>=$0
Option values are listed that relate to the pick up location, this value
can be changed to another new location and when the hold is placed
the hold will be placed for this new location instead of the listed options
in the Pick up location drop down list.
To test:
1. Apply patch
2. Repeat "How to replicate"
3. Observe it is no longer possible to place holds on libraries not defined
as pickup location by changing option value via Inspect Element tool
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4a36c1ac044ed9da3b67d32e9c315e61d2adc3bd
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Oct 31 14:34:53 2019 +0000
Bug 23719: (follow-up) Add warn when passed invalid search field in marclist
Note: I also remove warnings for undefined operation in this patch, is a trivial fix
To test:
prove -v t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 33595e1a3edd881e6b5489894c4676293839ed19
Author: Nick <nick at bywatersolutions.com>
Date: Wed Oct 2 11:17:13 2019 +0000
Bug 23719: Allow searching specific fields for matching authorities in ES
To test:
1 - Export your authorities via Tools->Export data
2 - Define a record matching rule in Admin->Record matchign rules
Use index: LC-card-number
field: 010$a
3 - Stage the exported records for import and use the rule created above for matching
4 - The process does not complete
5 - Check intranet error logs - exception on unknown marclist
6 - Apply patch
7 - Repeat
8 - Success!
9 - prove -v t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4c0786a1106ed170cbf80f0ebf71599b7ac9d3e9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 6 09:50:01 2019 +0100
Bug 23075: Correct indendation
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 42ebef689fb45255613381a4d176977cddc9dc9d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 4 15:09:34 2019 +0100
Bug 23075: Do not 'Send' if the url is not correct
Just in case.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1e47e5a849fb0297f7da1a5ebd5d94f5b8cd46f9
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Nov 4 13:13:16 2019 +0000
Bug 23075: (follow-up) Dissallow transparent redirects
GET request redirects were causing the http URL to 'pass' our 'good url'
test for http => https redirected mana servers. However, on the
subsquent POST request to get a mana security token we would fail as the
POST was not transparently redirected.
This patch changes the request to be a simple_request so we will catch
bad urls earlier and it also prevents submissions for security tokens if
the configured URL is identified as bad.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a1161ced1d977d872ab4238fc38ae30440978204
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jun 17 18:24:04 2019 +0100
Bug 23075: Report if mana-kb server is not found
This patch adds a status check into the mana configuration page and
prompts the user to ask an adminstrator to check the configured mana
service url.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b920cb708b8acacbf2075b00c0c68e70b6d5a29b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 5 10:25:50 2019 +0100
Bug 17359: Use a unicode character in tests
And remove an unused variable.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5b03d4be39497be0dbdce17ef26867ca80affec1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 16 10:47:28 2019 +0200
Bug 17359: Correct encoding when displaying patron import summary
There is an encoding issue when the patron import summry, the string
must be UTF8 decoded before being sent to the template.
Test plan:
- Create a patron import CSV file with import issues. Use UTF8 characters.
See file attached to the bug report 'patron_import.csv'
=> The screen should display the line correctly
- Correct the import issue (add a surname for Chloé)
=> The imported patrons should contain the correct values.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c58fc50128eff5d23ac7e9c71b6f78da3bba3c71
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 16 10:22:38 2019 +0200
Bug 17359: Add tests
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit cffa7623e13d8a21e66f5c9dc8caaa5668738411
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Nov 5 09:55:25 2019 +0100
Bug 23968: Add div this id around OPACMySummaryNote content
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d5c501bf63f9d42bc9d872eef391c0864753c8ba
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Nov 5 09:52:59 2019 +0100
Bug 23968: fix OPACMySummaryNote feature
The system preference OPACMySummaryNote is used to display on the logged-in patron summary page at OPAC.
It does not display anymore.
Looks like it comes from code :
[% IF OPACMySummaryNote %][% Koha.Preference('OPACMySummaryNote') | $raw %][% END %]
OPACMySummaryNote used to be a provided variable.
Test plan:
1) Enable system preference OPACMySummaryNote
2) Enter some HTML into it
3) Go to OPAC and loggin
4) Check you see the HTML in opac-user.pl
5) Disable the preference
6) Check you dont see the HTML anymore
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fad70512c0d6ebe72f34848406e00d9eb927930b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Apr 17 18:44:27 2019 +0000
Bug 11514: Untranslatable "Uncertain" text in acq
This patch modifies two pages so that the "Uncertain price" information
is shown by the template rather than the Perl script, making the text
translatable.
To test, apply the patch and go to Acquisitions.
- Locate or create an order in a basket which has an uncertain price.
- When viewing the contents of that basket the order which was marked
as having an uncertain price should be labeled "Uncertain."
- The same should be true for the invoice page. If you don't have an
existing invoice with an "uncertain" order,
- Go to "Receive shipments" for the vendor your "uncertain" order is
with.
- Create a new invoice.
- Receive one or more orders which has an uncertain price.
- Press the "finish receiving" button.
- In the "Invoice details" section of the invoice page you should
see the "Uncertain" label on the correct order.
Signed-off-by: Christophe Croullebois <christophe.croullebois at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
For the invoice view: close, receive, reopen, mark prices uncertain, go
to the invoice page (not sure it's expected however)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Patrons/Import.pm | 15 +-
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 14 +-
Koha/SharedContent.pm | 3 +-
acqui/basket.pl | 3 -
acqui/invoice.pl | 3 -
admin/share_content.pl | 18 ++-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 9 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +-
.../prog/en/modules/admin/share_content.tt | 162 ++++++++++----------
.../prog/en/modules/members/paycollect.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 +-
opac/opac-reserve.pl | 9 +-
t/db_dependent/Koha/Patrons/Import.t | 17 +-
.../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 47 ++++--
14 files changed, 181 insertions(+), 127 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list