[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.04-21-g16e2505
Git repo owner
gitmaster at git.koha-community.org
Mon Apr 1 14:16:16 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, 18.11.x has been updated
via 16e250542de43eadf62bc9354329912be84c3420 (commit)
via d5aa7655a643a5a4868a47b8aae5371438993580 (commit)
via 38bbe82aa07aa9a1a3cc33e00b5b8e459eb28a30 (commit)
via 34e0f9874f91b22c8fd24f76de74bb3c126d2a1e (commit)
via e3e64974d830a8699e8648a82d21a7ffce502955 (commit)
via 3b423071227ee3f9300907bb9e89cff26012aa29 (commit)
via 54de33967101173c72865e97fce0fd220e2d0842 (commit)
via ac1fdfe2258940cf4b7003d816b0e1723ed8963c (commit)
via df86121423c4770fe6d4971efeb5341e5a0b8825 (commit)
via 4c095218790767f14a9edae4386174b53a752b44 (commit)
via 9ef8a3e328e281bef98fe33a50f975322c26c25a (commit)
via c1d1880aeaf58052bc7782b30f57745a4bb78045 (commit)
via aa631b60e49f128bf7bbbe91e248f0af03e5f656 (commit)
via e180d8f46074a5088d517b154cd34526f3466d96 (commit)
via 49d3cd6a7bcca45fbd5954ee49a4d13ba6224f22 (commit)
via b875f2668d9605b90d7d2acb0ea8ec4da2f62fec (commit)
via 58497e1bc5de57fa1a9c20a7502714cc9e2bd3fd (commit)
via 70d465be6a43b45807b769725b48d5654c606e71 (commit)
via f4d9c3ae9f79b40eadae34b74b78adbb4ae43a06 (commit)
via 6826b12c74a345e50306add57061493beab7096b (commit)
via a0cefc86535244b0a603506daf5633a096d5c043 (commit)
from 319ef905cdb6724e605fab0365580248b9c3c61c (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 16e250542de43eadf62bc9354329912be84c3420
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Mar 8 10:12:50 2019 +0100
Bug 21049: Set 007/00 when selecting material type (Rancor)
There is a 1-1 relationship between the material type values and the
position 00 of 007 field. Selecting a material type should set this
position's value.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 856425db1e156ee4faf1aae70b0a78845711ba43)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d5aa7655a643a5a4868a47b8aae5371438993580
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Mar 6 08:43:18 2019 +0100
Bug 21049: Fix value of material select for Rancor 007 widget
The material type is selected in accordance with position 0 of 007
Test plan:
1. Create a new record using the advanced editor
2. Select a material type for field 007 and set at least the position 0
of this field
3. Save the record and reload the page
4. The material type should remain selected
5. Try with all available material types
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit e85294a738da7cce2a4897998ffa795f977b4cd7)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 38bbe82aa07aa9a1a3cc33e00b5b8e459eb28a30
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Mar 19 12:41:26 2019 +0000
Bug 22536: Display problem in Holds to Pull report
This patch modifies the display of several values in the holds to pull
report so that they can be displayed as lists instead of as chunks of
HTML generated in SQL.
This patch modifies the SQL in pendingreserves.pl so that values can be
formatted in the same way that holding branch is. The better long-term
solution is to remove SQL from pendingreserves.pl altogether, but this
is a quick fix.
This patch also makes a couple of minor markup changes to fix
validation.
To test, apply the patch and go to Circulation -> Holds to pull. To see
the changes the patch makes your holds to pull list should have titles
with multiple items at multiple branches, with call number, copy number,
and enumeration data. These values should all be displayed in bulleted
lists.
Signed-off-by: David Roberts <david.roberts at ptfs-europe.com>
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 9a321c128fed457bf6d11d2ce7ee7edf7dd28004)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 34e0f9874f91b22c8fd24f76de74bb3c126d2a1e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Mar 22 13:19:51 2019 +0000
Bug 22560: Forgotten password "token expired" page still shows boxes to reset password
This patch modifies the OPAC password recovery template so that the new
password entry form doesn't appear if the patron has followed an invalid
or expired link.
This patch also corrects the markup in the page title.
To test, apply the patch and follow the process for resetting a
forgotten password. When you follow the password recovery link, modify
the URL so that the "uniqueKey" parameter is different.
The page should show an error message. The password entry form should
not appear.
Check the page title in the browser's title bar. It should look correct.
https://bugs.koha-community.org/show_bug.cgi?id=22520
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 7ac1457ffc27cf6ec5a3a7bab6abc8a010e02b6a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e3e64974d830a8699e8648a82d21a7ffce502955
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Mar 22 12:57:31 2019 +0000
Bug 22561: Forgotten password requirements hint doesn't list all rules for new passwords
This patch modifies a few templates in the OPAC so that all available
information on password requirements is displayed for each case where
the patron is setting a password:
- If the RequireStrongPassword system preference is set, a message
should appear listing strong password requirements and minimum
password length.
- If RequireStrongPassword is not set, the message should only ask for
a minimum password length.
To test, apply the patch and enable the PatronSelfRegistration and
OpacResetPassword preferences.
On the following pages, test with RequireStrongPassword both on and
off. The correct messages should appear.
- OPAC -> Forgot password. Follow the process to reset your password
until you reach the step where you are entering the new password.
- OPAC -> Register here. Check the password section of the registration
form.
- OPAC -> Log in -> Change your password.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 50be1c4006e0a1d7e3b537bd849bc77f7a6bb56f)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3b423071227ee3f9300907bb9e89cff26012aa29
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Feb 20 11:26:40 2019 -0300
Bug 17746: (QA follow-up) Make set_password.pl generate a password if required
This patch makes the set_password.pl script generate the password if it
is not passed as an argument.
It also changes the behaviour of set_password.pl: it will now print the
userid and password (generated or not) to mimick the behaviour from
koha-reset-passwd.
The koha-reset-passwd gets simplified as it doesn't generate the random
password anymore, it passes the responsability to set_password.pl
To test:
- Follow the steps from the original platch
- Verify all behaves as expected
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 3ef48c8708736e9d5b16e462e520302c007cb4c1)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 54de33967101173c72865e97fce0fd220e2d0842
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Feb 4 15:09:34 2019 -0300
Bug 17746: Add misc/admin/set_password.pl script
This patch introduces a script that allows changing a patron's password.
The change overrides the defined password enforcement policy.
If multiple conditions are passed to match on the patron, they all need
to match. Otherwise an error message is printed.
Attributes to search the patron on:
- cardnumber
- patron_id (a.k.a. borrowernumber)
- userid
we usually know some of them, but if we specify more than one, they need
to match a patron, together.
To test:
1) Apply this patch
2) Have a known patron (i.e. you know the cardnumber, the borrowernumber
and the userid).
3) Run:
$ kshell
k$ perl misc/admin/set_password.pl --cardnumber <the_card_number> \
--password a_password
4) Verify you can login with the new password
5) Repeat 3) through 5) with --patron_id and --userid
=> SUCCESS: You can login in all cases
6) Try combining some or all the parameters
=> SUCCESS: It fails when it should, it succeeds when it should
7) Sign off :-D
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit e2f6542e1ebbd15977b47c86d2a9ef55fa0c5e9b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ac1fdfe2258940cf4b7003d816b0e1723ed8963c
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Feb 5 14:04:12 2019 -0300
Bug 17746: Make koha-reset-passwd user set_password.pl
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 0cd4ca289bd2e1bd11fdbd015225a909971ce213)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit df86121423c4770fe6d4971efeb5341e5a0b8825
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Mar 20 16:24:42 2019 +0000
Bug 22550: OPAC suggestion form doesn't require mandatory fields
Test plan:
1. OPAC->login->your purchase suggestions->New purchase suggestion
2. Click button "Submit your suggestion" directly without filling in any field.
Empty suggestion record was added succeffully.
3. Apply the patch.
4. Click button "Submit your suggestion" directly without filling in any field.
The required fields should be labeled in red.
(you can change the mandatory fields by preference 'OPACSuggestionMandatoryFields')
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Jogiraju,T. <rajujogi.t at gmail.com>
Signed-off-by: Jogiraju,T. <rajujogi.t at gmail.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 28e7f1d4e7a114b04d6940463f47351466a638dd)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4c095218790767f14a9edae4386174b53a752b44
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Tue Mar 12 11:29:33 2019 +0200
Bug 22495: Restore Elasticsearch mapping for su-geo
Test plan:
1. Reset mappings
2. Run perl misc/search_tools/rebuild_elastic_search.pl -d -b -v
3. Do a search and verify that the Places facet works
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 53b059afbb5731373a92a3ebaaceea4e1d656363)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9ef8a3e328e281bef98fe33a50f975322c26c25a
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Mon Dec 17 16:22:58 2018 +0200
Bug 21974: Make Elasticsearch connection settings configurable
Default settings are appended in get_elasticsearch_params so that there's a central place for them. Defaults can be overridden in koha-conf.xml.
Test plan:
1. Verify that searches still work with the patch applied.
2. Verify that search fails after adding the following under <elasticsearch> in koha-conf.xml:
<cxn_pool>Static</cxn_pool>
3. Verify that search fails after adding the following under <elasticsearch> in koha-conf.xml:
<cxn_pool>FOO</cxn_pool>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 65f35447e93008810cec3eba63a286b9940d5824)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c1d1880aeaf58052bc7782b30f57745a4bb78045
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Mar 25 12:58:39 2019 +0000
Bug 21622: (RM follow-up) adjust for changes from bug 21282
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 18f9c3eb514f5733c55d92b16bd0f38d29161290)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit aa631b60e49f128bf7bbbe91e248f0af03e5f656
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 27 14:49:35 2019 -0300
Bug 21998: Silent tests
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit e9fa69ca64e78cc9ea540e3fed1e9ffb1b3488fe)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e180d8f46074a5088d517b154cd34526f3466d96
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Dec 18 11:53:21 2018 +0000
Bug 21998: Throw exception on bad pattern
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
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>
(cherry picked from commit ee73d577ed564d98e77cf25fcdadcbc594f7217c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 49d3cd6a7bcca45fbd5954ee49a4d13ba6224f22
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Sep 19 15:36:36 2018 +0200
Bug 21998: Add pattern parameter in Koha::Token
Allow a pattern too in Koha::Token->generate. Only supported length.
Does not affect CSRF calls. So tiny change without further impact.
Test plan:
Run t/Token.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit b794643bb075c0aa5de81f2481ae1df56f674309)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b875f2668d9605b90d7d2acb0ea8ec4da2f62fec
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Feb 26 09:16:05 2019 +0000
Bug 19661: (follow-up) Use Basic auth in tests
Test plan:
prove t/db_dependent/api/v1/acquisitions_funds.t
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 48484173e26bf9859984860a17089f09de5c8b6a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 58497e1bc5de57fa1a9c20a7502714cc9e2bd3fd
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Tue Jan 15 10:46:04 2019 +0100
Bug 19661: Add and change properties and parameters to conform to the funds RFC.
Also, perform an exact search when searching on the fund owner id.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 6e98cc4503cedba411371d4005be41b5822569c8)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 70d465be6a43b45807b769725b48d5654c606e71
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Wed Jan 17 11:49:14 2018 +0100
Bug 19661: Use Koha::Acquisition::Funds instead of C4::Budgets
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit b6be4024196c9e62363eabf0d2ad0b9f9141d15c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f4d9c3ae9f79b40eadae34b74b78adbb4ae43a06
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Thu Oct 12 07:55:12 2017 +0000
Bug 19661: REST API - Funds Endpoint
This patch adds a new route to the REST api:
/api/v1/acquisitions/funds/
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 717975abebe938a5e79ffc07055ed6190b43f206)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6826b12c74a345e50306add57061493beab7096b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Mar 22 19:20:55 2019 +0000
Bug 21948: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 7a9a8f2f08e4b74af712d59e1f1f9f0a7b3205a0)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a0cefc86535244b0a603506daf5633a096d5c043
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 4 19:53:29 2018 +0000
Bug 21948: Clean up style of item detail page
This patch removes some page-specific style from the item detail page in
the staff client and adds some markup in order to trigger a more
generally-used style.
This patch also adds a font-awesome icon to the "Edit item" link on the
page.
To test, apply the patch and regenerate the staff client CSS. Open a
bibliographic record and view the "Items tab."
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 32020105e8494ba82a8a505711c5047560c9d304)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
.../BasketGroups.pm => Exceptions/Token.pm} | 35 +++--
Koha/REST/V1/Acquisitions/Funds.pm | 134 ++++++++++++++++++++
Koha/SearchEngine/Elasticsearch.pm | 13 +-
Koha/Token.pm | 22 +++-
acqui/ordered.pl | 2 +-
acqui/spent.pl | 4 +-
admin/searchengine/elasticsearch/mappings.yaml | 19 +++
api/v1/swagger/definitions.json | 3 +
api/v1/swagger/definitions/fund.json | 101 +++++++++++++++
api/v1/swagger/parameters.json | 5 +-
api/v1/swagger/parameters/fund.json | 9 ++
api/v1/swagger/paths.json | 3 +
api/v1/swagger/paths/acquisitions_funds.json | 73 +++++++++++
api/v1/swagger/x-primitives.json | 6 +
circ/pendingreserves.pl | 12 +-
debian/scripts/koha-reset-passwd | 61 ++++++---
.../intranet-tmpl/lib/koha/cateditor/widget.js | 2 +-
.../intranet-tmpl/prog/css/src/staff-global.scss | 16 ---
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../prog/en/includes/cateditor-widgets-marc21.inc | 33 ++++-
.../prog/en/modules/catalogue/moredetail.tt | 12 +-
.../prog/en/modules/circ/pendingreserves.tt | 51 +++++++-
.../bootstrap/en/modules/opac-memberentry.tt | 8 +-
.../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 7 +-
.../bootstrap/en/modules/opac-password-recovery.tt | 12 +-
.../bootstrap/en/modules/opac-suggestions.tt | 2 +-
misc/admin/set_password.pl | 129 +++++++++++++++++++
t/Token.t | 14 +-
t/db_dependent/api/v1/acquisitions_funds.t | 84 ++++++++++++
29 files changed, 781 insertions(+), 93 deletions(-)
copy Koha/{Acquisition/BasketGroups.pm => Exceptions/Token.pm} (57%)
create mode 100644 Koha/REST/V1/Acquisitions/Funds.pm
create mode 100644 api/v1/swagger/definitions/fund.json
create mode 100644 api/v1/swagger/parameters/fund.json
create mode 100644 api/v1/swagger/paths/acquisitions_funds.json
create mode 100755 misc/admin/set_password.pl
create mode 100644 t/db_dependent/api/v1/acquisitions_funds.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list