[koha-commits] main Koha release repository branch master updated. v17.11.00-292-g3524925
Git repo owner
gitmaster at git.koha-community.org
Mon Jan 15 16:32:16 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 3524925631817521480cb233d6c60927d80e93c5 (commit)
via 163404d9c7bc1c3d35d4810e0b91f7cd47dab987 (commit)
via 9d0284f79d9b0f56b0762a7ebe4012454827f5a8 (commit)
via 0f9cb38f1d8dc690e20e0a73b2566be8abece9c8 (commit)
via dd772363716f8b6ba9eec6c429680dfef5652737 (commit)
via d8963726d0ea00c50c4914dfd5172cb01a708fb4 (commit)
via 5239269216bac250593a32bdf4cce3a6fae0f8fc (commit)
via cd7df9a7a3f4ec5b0c2356089b56c47165f87abb (commit)
via 579507e7f728a070629649aad07e4e1c8fb7510a (commit)
via 585453fe20417779be84258b60d3d652d8e170e1 (commit)
via 834b8c749b59600c62d16868d8e5104ba3e0795b (commit)
via 574809f37b8e64f12f39cfcb544a792f3c398c37 (commit)
from cc30c8bc3f53287c0cb90f7bde1ce616bf9583d2 (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 3524925631817521480cb233d6c60927d80e93c5
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Jan 9 14:37:08 2018 +0000
Bug 19937: Silence warnings t/db_dependent/www/batch.t
TEST PLAN
---------
1) Run the following on a kohadevbox:
git checkout -b bug_19937 origin/master
sudo koha-shell -c bash kohadev
prove t/db_dependent/www/batch.t
cat /var/log/koha/kohadev/plack-error.log
The following errors are triggered at the end of the log file:
Use of uninitialized value in array element at
/home/vagrant/kohaclone/tools/batch_records_ajax.pl line 50.
Use of uninitialized value $results_per_page in numeric eq (==) at
/home/vagrant/kohaclone/tools/batch_records_ajax.pl line 53.
Use of uninitialized value in uc at
/home/vagrant/kohaclone/C4/ImportBatch.pm line 1120.
2) Run the following on a kohadevbox:
exit
git bz apply 19937
restart_all
sudo koha-shell -c bash kohadev
prove t/db_dependent/www/batch.t
cat /var/log/koha/kohadev/plack-error.log
The log file will end with the restarting of plack, not the
errors.
3) run koha qa test tools
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended handling of $results_per_page.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 163404d9c7bc1c3d35d4810e0b91f7cd47dab987
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date: Wed Oct 18 14:33:22 2017 +0300
Bug 19483: Fix test plan in t/db_dependent/www/*
t/db_dependent/www/* crashes test harness due to misconfigured test plan
prove t/db_dependent/www/
without defining KOHA_INTRANET_URL
bails out and marks the whole test suite as failed.
Test suite should not be failed if this optional WWW::Mechanize test
suite is not activated.
After this patch, the tests are properly skipped without failing the
whole tests.
This is important when running all tests under t, as this needlessly
fails the test suite.
Also handling of 'skip_all' is inconsistent in t/db_dependent/www
-tests, so this normalizes it to skip_all instead of bail_out
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9d0284f79d9b0f56b0762a7ebe4012454827f5a8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 15 12:19:08 2018 -0300
Bug 18915: DBRev 17.12.00.005
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0f9cb38f1d8dc690e20e0a73b2566be8abece9c8
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>
commit dd772363716f8b6ba9eec6c429680dfef5652737
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>
commit d8963726d0ea00c50c4914dfd5172cb01a708fb4
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>
commit 5239269216bac250593a32bdf4cce3a6fae0f8fc
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>
commit cd7df9a7a3f4ec5b0c2356089b56c47165f87abb
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>
commit 579507e7f728a070629649aad07e4e1c8fb7510a
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>
commit 585453fe20417779be84258b60d3d652d8e170e1
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>
commit 834b8c749b59600c62d16868d8e5104ba3e0795b
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>
commit 574809f37b8e64f12f39cfcb544a792f3c398c37
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>
-----------------------------------------------------------------------
Summary of changes:
C4/ImportBatch.pm | 2 +-
Koha.pm | 2 +-
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 4 ++--
circ/circulation.pl | 2 +-
.../data/mysql/en/mandatory/sample_notices.sql | 3 ++-
installer/data/mysql/updatedatabase.pl | 25 ++++++++++++++++++--
.../en/modules/opac-registration-confirmation.tt | 4 ++--
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +-
members/boraccount.pl | 2 +-
members/holdshistory.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 | 23 +++++++++++++++++-
t/db_dependent/www/auth_values_input_www.t | 16 +++++++------
t/db_dependent/www/batch.t | 12 +++++++---
t/db_dependent/www/history.t | 17 +++++++------
t/db_dependent/www/search_utf8.t | 7 ++++--
tools/batch_records_ajax.pl | 4 ++--
29 files changed, 115 insertions(+), 52 deletions(-)
rename opac/svc/{patron_notes => checkout_notes} (95%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list