[koha-commits] main Koha release repository branch master updated. v19.11.00-47-g044b6ea
Git repo owner
gitmaster at git.koha-community.org
Fri Dec 13 16:55:56 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 044b6eadd591f6f6c02496ed3d47403cc2d3f7f5 (commit)
via 83e83adfb5aa2c5ca3459acc640739ba2dfb9c13 (commit)
via 1cce77631aea7b3e24aeed8daa649001d4b56b10 (commit)
via 219c2de66adea29ff26b9a580c039a1d59fd8864 (commit)
via e25944a8b195d2cde6c979adadfc03f4b7314ddc (commit)
via f8030195f7a93190f25319dc0f1491cc88a25316 (commit)
via 8da531afc361d6605bacdbbe051394a1023119d3 (commit)
via 73870efdb78e6ff93b4186244f51516f69e063e7 (commit)
from ed6fdb916c14983cfb898ba204510e11e423e412 (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 044b6eadd591f6f6c02496ed3d47403cc2d3f7f5
Author: Lucas Gass <lucas at bywatersolutions.com>
Date: Thu Dec 5 21:52:31 2019 +0000
Bug 24184: Reword FallbackToSMSIfNoEmail syspref text
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 83e83adfb5aa2c5ca3459acc640739ba2dfb9c13
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 5 13:19:20 2019 +0100
Bug 21270: Display "Make an Interlibrary loan request" even if "suggestions" is turned off
Test plan:
- Turn off "suggestions"
- Turn on "ILLModule"
=> When logged in you should see the "Make an Interlibrary loan request"
- Turn on "suggestions"
- Turn off "ILLModule"
=> When logged in you should see the "Make a purchase suggestion"
- Turn on "suggestions"
- Turn on "ILLModule"
=> When logged in you should see both links.
- Turn off "suggestions"
- Turn off "ILLModule"
=> You should not see the "Not finding what you're looking for?" block
- Turn on "suggestions"
- Turn on AnonSuggestions
=> You should see the "Make a purchase suggestion" even when logged out
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1cce77631aea7b3e24aeed8daa649001d4b56b10
Author: Blou <philippe.blouin at inlibro.com>
Date: Fri Aug 24 11:46:54 2018 -0400
Bug 21270: "Not finding what you're looking for" displaying uselessly
When doing OPAC search, at the bottom you have an offer presented with "Not finding what you're looking for" to introduce Suggestions or ILL if enabled.
Bug 7317 modified the if-else and now if you enable ILLModule but not AnonSuggestions and are not logged, you have this little string sitting there, offering nothing to the user.
Just taunting them...
TEST:
0) Set IllModule to true, AnonSuggestions to false.
1) Without login, just to an OPAC search. At the bottom will be a nice string laughing at your failed search
2) Apply the patch.
3) Problem at 1) is fixed.
4) Login to validate that ILL link now appear.
5) Modify combination of IllModule and AnonSuggestions to validate links appearing.
Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 219c2de66adea29ff26b9a580c039a1d59fd8864
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 22 16:47:45 2019 +0000
Bug 13806: Sanitize inputs where creating Reports subgroup
This patch adds validation of report group and subgroup inputs so that
the user can't enter data into only one half of the group code/name
pair.
To test, apply the patch and go to Reports -> Use saved.
- Create or edit a report which doesn't have a group or subgroup
assigned.
- Under "Report group," select the "or create" radio button.
- Click the "Update SQL" button to submit the form without entering a
group code or name. The form should require taht you enter data into
both fields.
- Enter data into the report group code and name fields. Add data to
either the code or data field under "Report subgroup." You should
not be able to submit the form without populating both.
- Start over editing a report which doesn't have a group or subgroup
assigned.
- Select an existing group under "Report group."
- Under "Report subgroup," select the "or create" option.
- You should not be able to submit the form without adding data in
both the code and name fields for the report subgroup.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e25944a8b195d2cde6c979adadfc03f4b7314ddc
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Dec 13 07:01:23 2019 +0100
Bug 24230: fix intranet_js plugin hook before body end tag
The plugin hook intranet_js is after body tag in intranet-bottom.inc :
</body>
[% KohaPlugins.get_plugins_intranet_js | $raw %]
</html>
It must be before like in opac-bottom.inc
Test plan :
1) Install a Koha plugin with intranet_js hook, like KitechenSink
2) Go to an intranet page
3) Look at source of the page to see plugin code is before body end tag
Signed-off-by: Nicolas Legrand <nicolas.legrand 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 f8030195f7a93190f25319dc0f1491cc88a25316
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Dec 13 10:03:20 2019 +0000
Bug 23800: (QA follow-up) Remove useless line
The lines with my @barcodes makes no sense anymore.
Test plan:
Test with a barcode file.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8da531afc361d6605bacdbbe051394a1023119d3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Dec 13 09:28:28 2019 +0000
Bug 23800: (QA follow-up) Fix item case, reduce code
The solution for items does not work, since it compares barcodes.
Instead of a grep in a map, we could do simpler.
Test plan:
Try barcode file, order not by itemnumber. Toggle with case. Add wrong code.
Try same via barcode list text area.
Try an itemnumber file, reorder again. Add wrong number.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 73870efdb78e6ff93b4186244f51516f69e063e7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 11 11:09:45 2019 +0100
Bug 23800: Does not order items by barcode in batch item modification
They must be displayed in the same order they have been scanned (or they
appear in the file)
This is an alternative patch. Same behavior for barcodes or itemnumbers,
as well as if a file has been used or items scanned.
Code is duplicated, but refactoring is out of the scope.
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
.../prog/en/includes/intranet-bottom.inc | 2 +-
.../prog/en/modules/admin/preferences/patrons.pref | 2 +-
.../en/modules/reports/guided_reports_start.tt | 80 ++++++++++++++++----
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 11 +--
tools/batchMod.pl | 32 +++-----
5 files changed, 84 insertions(+), 43 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list