[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.08-22-g56f1a54
Git repo owner
gitmaster at git.koha-community.org
Tue Jan 30 10:23:29 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, 17.05.x has been updated
via 56f1a54656a03bdcdbc8730427c91584b8ec8080 (commit)
via f9efe84a2d382df3091f5b6eea76c2fdab143fbc (commit)
via 387b40bf23ea15bb3d40090d2d96fc69228b3e92 (commit)
via 5a2b7813592be0ce51510acfa3d3b22a4fd21806 (commit)
via ca185a5e86fdfb97958ce593b57014302fe0c630 (commit)
via 7d1409e188437155911764757a0c61c54b0cd90d (commit)
via eb2592e028c28b51d6276b3cb7102c6cfce19357 (commit)
via 8e909bcdb105a879b97298996a1dac860566f7d4 (commit)
via a4245efd875c74c9a342db0eb7cfbd72c8d6920d (commit)
via b5ceced57697b97d727430c21fddd62c06830a51 (commit)
via ec601b839192c3c588ab4d2337213d52df92d49e (commit)
via 70c0452e2ca9fb1a48250a5ce302b68cc434e88f (commit)
via afeef629f5794e2aadf43c65e751e054be7efe10 (commit)
from a91e24454d434b9ee9bb826c196f60c186ba78ec (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 56f1a54656a03bdcdbc8730427c91584b8ec8080
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 15 13:41:41 2018 -0300
Bug 18915: Add CHECKOUT_NOTE notice template for other languages
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit ceeb92081a8dc67f8c685319eb461162b0ba7a19)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit f9efe84a2d382df3091f5b6eea76c2fdab143fbc
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Jan 30 09:26:39 2018 +0100
Bug 18915: DBRev 17.05.08.001
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 387b40bf23ea15bb3d40090d2d96fc69228b3e92
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 12 11:31:42 2018 +0100
Bug 18915: (QA follow-up) Add note for installs after 17.05
Since the 17.05 upgrade adds the note and the sql file did not yet include
the note, we should add it when it is not there (for example new 17.11s).
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested by running the dbrev while there is a letter and while not.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit e7dd617de0e8eb1769c81cbfe85333ace701764d)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 5a2b7813592be0ce51510acfa3d3b22a4fd21806
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Sun Dec 17 23:42:36 2017 +0000
Bug 18915: Renaming svc/patron_notes to svc/checkout_notes
For consistency.
Signed-off-by: Marjorie Barry-Vila <marjorie.barry-vila at collecto.ca>
https://bugs.koha-community.org/show_bug.cgi?id=19801
Signed-off-by: Marjorie Vila <marjorie.barry-vila at collecto.ca>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 065d3de88c55d8ce9efd05ecf80b073fffef242a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit ca185a5e86fdfb97958ce593b57014302fe0c630
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Sun Dec 17 23:33:18 2017 +0000
Bug 18915: Giving CHECKOUT_NOTE access to issues table
This patch allows the notice to reference the issues table so that the
checkout note itself can be added to the note if wanted, such as in
Comment 9.
Sponsored-by: Catalyst IT
Signed-off-by: Marjorie Barry-Vila <marjorie.barry-vila at collecto.ca>
https://bugs.koha-community.org/show_bug.cgi?id=19801
Signed-off-by: Marjorie Vila <marjorie.barry-vila at collecto.ca>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 92972fa3de205d736185e8a39b1e59309794f875)
commit 7d1409e188437155911764757a0c61c54b0cd90d
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Sun Aug 27 23:20:40 2017 +0000
Bug 18915: Fix checkout note email message
This patch replaces the <<biblio.item>> in the email with
<<biblio.title>> and uses CHECKOUT_NOTE instead of PATRON_NOTE.
This patch also adds the notice to
installer/data/mysql/en/mandatory/sample_notices.sql, and updates the
PATRON_NOTE entry in installer/data/mysql/updatedatabase.pl
To test:
1) Apply patch and update database
2) View the message_queue table in mysql
3) Check out an item if haven't already
4) Go to OPAC and set a checkout note for an item
5) View message_queue table and confirm it the title is included in the
email and all instances of 'patron note' have been replaced with
'checkout note'
6) Disable javascript in browser
7) repeat steps 4 and 5 and confirm all works as expected
Sponsored-by: Catalyst IT
Signed-off-by: Marjorie Vila <marjorie.barry-vila at collecto.ca>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit c199ced310abdef53379115ee285757df20ac335)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit eb2592e028c28b51d6276b3cb7102c6cfce19357
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 3 16:15:18 2018 -0300
Bug 19911: Escape password value during self-registration confirmation
The password must be correctly escape, it can contains html character
and break the display.
Test plan:
Apply first patch and confirm that the display is broken
Apply second patch (this one) and confirm that the display is fixed
Signed-off-by: Arturo <alongoria at sll.texas.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f6adfb4257d0326a101771246777b10965632bc8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 8e909bcdb105a879b97298996a1dac860566f7d4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jan 4 11:00:35 2018 -0300
Bug 19911: Do not escape html characters when saving passwords
When the password is not generated automatically, we should not escape
the html characters. Otherwise it will be changed without any warnings.
Signed-off-by: Arturo <alongoria at sll.texas.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 25b2cd2d72feda887d0d0f242972baa80f0d3463)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit a4245efd875c74c9a342db0eb7cfbd72c8d6920d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jan 5 16:36:31 2018 -0300
Bug 19921: Fix update child when only one adult patron category exist
We are passing the Koha::Patron::Category object to the template instead
of the categorycode.
To reproduce this bug you must test in a system which has only one
patron category of the "adult" type. View the details of a patron with a
child-type patron category and choose More -> Update child to adult
patron.
This results in an error:
Can't call method "category_type" on an undefined value at
/home/vagrant/kohaclone/members/update-child.pl line 84.
The URL of the error page shows a problem with the parameters being
passed:
members/update-child.pl?op=update&borrowernumber=12345&catcode=Koha::Patron::Category=HASH(0xa168a18)&catcode_multi=
Test plan:
Make sure you have only 1 adult patron category
Update a child to adult
=> With this patch applied the error is gone and the patron has been
correctly updated
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d735b4957b6073c6d8bf085cc81382dc4dc50d06)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b5ceced57697b97d727430c21fddd62c06830a51
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sat Nov 4 01:01:42 2017 +0000
Bug 19580: Exclude period as splitting character for autotrunction
To test:
0 - Apply Unit test patch only
1 - prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
2 - Should fail
3 - Apply this patch
4 - prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
5 - should pass
6 - search for 'Local-number.raw:"4"' (or a vlid biblionumber)
7 - should get expected result
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 4538e6c4981b096f8ddcf4b235a7f9e2860ffe9b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit ec601b839192c3c588ab4d2337213d52df92d49e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sat Nov 4 01:01:20 2017 +0000
Bug 19580: Unit tests
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 57605308436cb0f60e2f45933126a61f17f88092)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 70c0452e2ca9fb1a48250a5ce302b68cc434e88f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 1 15:47:39 2017 +0000
Bug 19559: Add '-' to list of characters we don't split search terms on
Test plan assumes
QueryAutoTruncate = automatically
SearchEngine = Elasticsearch
To test:
0 - Apply Unit test patch only
1 - prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
2 - Should fail
3 - Apply this patch
4 - prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
5 - should pass
6 - search for 'Local-number:"4"' (or a vlid biblionumber)
7 - should get expected result
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>
(cherry picked from commit a081ed16c0c3295253408f999354e6bbfa5fe183)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit afeef629f5794e2aadf43c65e751e054be7efe10
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 1 15:46:59 2017 +0000
Bug 19559: Add tests
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>
(cherry picked from commit 26be355fe8c83a187a0cfbdae4f3a9e3b9ba8be9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 4 +--
circ/circulation.pl | 2 +-
.../data/mysql/de-DE/mandatory/sample_notices.sql | 3 +-
.../data/mysql/en/mandatory/sample_notices.sql | 3 +-
.../data/mysql/es-ES/mandatory/sample_notices.sql | 3 +-
.../mysql/fr-CA/obligatoire/sample_notices.sql | 3 +-
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 3 +-
installer/data/mysql/it-IT/necessari/notices.sql | 3 +-
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 3 +-
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 3 +-
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 3 +-
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 4 ++-
installer/data/mysql/updatedatabase.pl | 22 +++++++++++-
.../en/modules/opac-registration-confirmation.tt | 4 +--
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +-
members/boraccount.pl | 2 +-
members/mancredit.pl | 2 +-
members/maninvoice.pl | 2 +-
members/member-flags.pl | 2 +-
members/member-password.pl | 2 +-
members/moremember.pl | 2 +-
members/pay.pl | 2 +-
members/paycollect.pl | 2 +-
members/printfeercpt.pl | 2 +-
members/printinvoice.pl | 2 +-
members/readingrec.pl | 2 +-
opac/opac-issue-note.pl | 2 +-
opac/opac-memberentry.pl | 13 ++++---
opac/svc/{patron_notes => checkout_notes} | 5 +--
.../Koha_SearchEngine_Elasticsearch_Search.t | 37 +++++++++++++++++++-
31 files changed, 109 insertions(+), 37 deletions(-)
rename opac/svc/{patron_notes => checkout_notes} (95%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list