[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.09-15-gc110912
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 21 12:02:59 CEST 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.11.x has been updated
via c110912af3f4ff5f41eea4668d38863a951d82c0 (commit)
via d802bf6722f9ac79b9460edc307c656cd3358763 (commit)
via 711f65a6894f8979734f2738ec3500dee4756826 (commit)
via 3725ca1be905bfa02ccac12e5256e6f33ff0e164 (commit)
via 7a75e0b963c6fa7e087d5cd41dc9a777c1ebfa31 (commit)
via 990b133fa7f44c22de2bfcac6a6f8055481b8203 (commit)
from 1293b0a05b1991f80ac547106a861c253c81aa35 (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 c110912af3f4ff5f41eea4668d38863a951d82c0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 31 12:43:54 2018 -0300
Bug 21134: Correctly throw the exception in Koha::Patron::Modification->approve
koha_1 | # Looks like you planned 20 tests but ran 9.
koha_1 |
koha_1 | # Failed test 'approve tests'
koha_1 | # at t/db_dependent/Koha/Patron/Modifications.t line
259.
koha_1 | [Something went wrong]# Looks like your test exited with
255 just after 5.
koha_1 | [21:13:47] t/db_dependent/Koha/Patron/Modifications.t
.....................
"Something went wrong" should never been thrown,
Koha::Patron::Modification->approve raises $@, but it's not defined, it
should raise $_ instead
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 6e99cfbca7e904b7664163838a334c487c94e462)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit c6133753ed661902a9ec3cce14190c7d3d683ef0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d802bf6722f9ac79b9460edc307c656cd3358763
Author: David Cook <dcook at prosentient.com.au>
Date: Fri Jul 20 18:13:49 2018 +1000
Bug 21097: Missing optgroup closing tag in orderreceive.tt
There is a missing optgroup closing tag in orderreceive.tt. It doesn't
actually cause any display issues (at least in modern browsers), but
it's invalid markup, so this patch fixes it.
_TEST PLAN_
0. Add a budget and add a fund
1. Add a vendor
2. Add a basket
3. Add an order to a basket
4. Close the basket
5. Receive the order
6. Make sure the budget and fund both display when selecting the fund
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 12e18f91be2a26501fba502d5f1106d66b06caee)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 881781240cf0c1a487da1d05732dab300d6e1be7)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 711f65a6894f8979734f2738ec3500dee4756826
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jun 21 13:37:35 2018 +0000
Bug 20974: Remove files left behind after removing Solr
Some files were left behind when Bug 12538 removed support for Solr.
This patch removes them.
To test, apply the patch and fail to observe the existence of these
files:
koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc
Perform a search in the OPAC to confirm that nothing broke.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit ad34ef74cdee0f204c03cdf88b1db775768a44fe)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 517827fb9c2e69d58d8e9345ba2d259de08efded)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 3725ca1be905bfa02ccac12e5256e6f33ff0e164
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jul 12 10:18:10 2018 +0000
Bug 21064: Use undefined instead of undef
To test:
1 - Load the advanced cataloging editor
2 - Refresh the page several times
3 - Check the JS console, you shoudl see an error:
'undef is not defined'
4 - Apply patch
5 - Try again, should be no error
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.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 367f47c416fa9164ccb8d9e5f50772e5a516d6b7)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit f60c611972fe0442ee66f6ebf3a40f00bd11efcc)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 7a75e0b963c6fa7e087d5cd41dc9a777c1ebfa31
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 11 18:55:06 2018 -0300
Bug 21053: Encode URI characters in plugin 008
A # (or &) at any position in 008 field of a bib record causes
all subsequent data in field to be overwritten with default values when
record is saved.
These characters need to be correctly encoded before being passed as
parameters of the url
To reproduce:
1. Find and edit a bib record which has an 008 which differs from the
default values for the MARC framework
2. Choose 008 helper
3. Add # in any position before the end of the field noting the current
values of the data
4. Save record
5. Edit record and select 008 helper
6. Review characters after #
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and it works.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit bfdf896111849454ade806bf49f48f1de5f626be)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 512ee5d57617c63da90be09268a77a0317c9e886)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 990b133fa7f44c22de2bfcac6a6f8055481b8203
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 13 17:49:14 2018 +0000
Bug 21076: Don't call autocomplete code after patron found
To test:
1 - Enable article requests
2 - Search on staff client
3 - Click 'Request article'
4 - Find a patron
5 - View error in console
6 - Apply patch
7 - Reload
8 - Not error is gone
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and it works.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5a9bad787458411c790d26b3b115fe3e7e2e0ab2)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 50f4e8635056d7b664b846db91d48bf282fef949)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Patron/Modification.pm | 2 +-
cataloguing/value_builder/marc21_field_008.pl | 2 +-
.../prog/en/includes/cateditor-ui.inc | 2 +-
.../prog/en/modules/acqui/orderreceive.tt | 1 +
.../prog/en/modules/circ/request-article.tt | 38 ++++++-------
.../bootstrap/en/includes/search/facets.inc | 56 --------------------
.../bootstrap/en/includes/search/page-numbers.inc | 18 -------
.../bootstrap/en/includes/search/resort_form.inc | 23 --------
8 files changed, 24 insertions(+), 118 deletions(-)
delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list