[koha-commits] main Koha release repository branch master updated. v18.05.00-724-g293e84d
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 14 22:02:49 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, master has been updated
via 293e84d38dd25ae5bd08c2cdd5ce064f4201a79c (commit)
via c427952783776bd9e6f79ee3860f968bea5b82a9 (commit)
via cf3dbedae75b19ffd649725dddce212b63738582 (commit)
via 4e8d22a51bf707d3e160a87a125bd8d8f9eb04e6 (commit)
via 5d2ef635627fd35f721c086e7b6491a7e82b958a (commit)
via 0c4460c2fbb6fb678381921911d9030419cc9700 (commit)
via 5acdbb1d2dcb0bd2719f88aa6905c2cf91fab1db (commit)
via 59b78fd095ecf7db88f339cc2f03d923b095130d (commit)
via b8104d8882790b45c1d3b65386bd37ed1cc671d7 (commit)
via 5ef7f04f58dd470b85988b866a2e608256904da8 (commit)
via 765c28c8e3a7e11afac1a061ebd296f18f3ef8a5 (commit)
via fac3944aa1c6c0c43e5ceac77fe1d163b22bf3e2 (commit)
via 51a769bb59efe1b4511805734d2ef73b8fbbac81 (commit)
via 42c94d185ab44c075073dd08762c4bb71df77b16 (commit)
via 18d85cc8d72b55880e88c5364a3819965c8a2831 (commit)
via 83e515820abb6e2fa8ddf30f61b3f4972a48ed10 (commit)
via 030047da428521c248868e3ee5d655afd3bed05b (commit)
via bf7082f854a1db9eb5b7eb77e5f450d018d8e07b (commit)
via 331af8521b5fba4b5553c182888a4017b2ce9c3a (commit)
via 68138b225807a857ddbddef7680c43f2b10de87e (commit)
via 235654a3cfa5b6e323489408ddc7875281bb1f50 (commit)
via 3fedae85f25ef5f587d567b51b86aab776d87311 (commit)
via 46c992948ea28ae2bebc7f9042df6434319b80bf (commit)
via be0a897648e4ae1ebb429d0829c22a8534a81606 (commit)
from a9e859942c8cf8c4de8e872fb3ed79b5f80fa19a (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 293e84d38dd25ae5bd08c2cdd5ce064f4201a79c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Aug 31 13:51:18 2018 -0300
Bug 21293: Remove another misplaced html filter on housebound.tt
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c427952783776bd9e6f79ee3860f968bea5b82a9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 30 16:43:09 2018 +0000
Bug 21293: Display of housebound delivery information broken by Bug 13618
This patch corrects the patron housebound details template. A stray
"html" filter broke display of delivery information.
To test, apply the patch and enable the HouseboundModule system
preference.
- Open a patron record and select the "Housebound" tab in the left-hand
navigation menu.
- Click "Add a new deliver" and save some delivery details.
- Upon saving you should be directed back to the housebound details
page. All the details of the delivery you saved should appear
correctly.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cf3dbedae75b19ffd649725dddce212b63738582
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 14 12:27:36 2018 -0700
Bug 21233: (QA follow-up) It is not only trailing whitespace characters
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4e8d22a51bf707d3e160a87a125bd8d8f9eb04e6
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 24 11:06:14 2018 +0200
Bug 21233: (QA follow-up) We do not like the plural form of whitespace
The word "whitespace" is usually uncountable.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5d2ef635627fd35f721c086e7b6491a7e82b958a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Aug 16 06:54:53 2018 -0300
Bug 21233: Unit tests
This patch adds tests for the required password-related exceptions. The
tests verify the stringified version of the exceptions.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/Koha/Exceptions.t
=> FAIL: Exceptions not implemented, tests fail!
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
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: Nick Clemens <nick at bywatersolutions.com>
commit 0c4460c2fbb6fb678381921911d9030419cc9700
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Aug 16 06:56:30 2018 -0300
Bug 21233: Add Koha::Exceptions::Password
This patch adds some exceptions that we need. To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/Koha/Exceptions.t
=> SUCCESS: Tests pass!
- Sign off! :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
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: Nick Clemens <nick at bywatersolutions.com>
commit 5acdbb1d2dcb0bd2719f88aa6905c2cf91fab1db
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Sep 14 17:46:58 2018 +0000
Bug 19469: DBRev 18.06.028
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 59b78fd095ecf7db88f339cc2f03d923b095130d
Author: Kyle M Hall <kyle at bywatersolutiosn.com>
Date: Fri Sep 7 14:28:31 2018 -0400
Bug 19469: (QA follow-up) Disable priority pulldowns when using split holds queue
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b8104d8882790b45c1d3b65386bd37ed1cc671d7
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Sep 7 15:02:25 2018 +0000
Bug 19469: (RM follow-up) Add filters and fix variable name
https://bugs.koha-community.org/show_bug.cgi?id=19469
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5ef7f04f58dd470b85988b866a2e608256904da8
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Apr 27 09:21:28 2018 +0000
Bug 19469: (QA follow-up) When altering priorities, use the existing priority numbers of the given table
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 765c28c8e3a7e11afac1a061ebd296f18f3ef8a5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Apr 17 14:29:27 2018 +0000
Bug 19469: (QA follow-up) Use hold item's itemtype if available, fix priority changing
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fac3944aa1c6c0c43e5ceac77fe1d163b22bf3e2
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Wed Mar 7 07:05:11 2018 -0500
Bug 19469: Remove use of Dumper on request.tt
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 51a769bb59efe1b4511805734d2ef73b8fbbac81
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Mar 5 16:10:25 2018 -0300
Bug 19469: (follow-up) Use patron-title.inc as proposed by bug 18403
This patch makes the new template include file use the patron-title.inc
include to render the patron name.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 42c94d185ab44c075073dd08762c4bb71df77b16
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Sat Sep 30 08:02:57 2017 -0400
Bug 19469: Add ability to split view of holds view on record by pickup library and/or itemtype
It is possible to set up circulation rules to limit trapping of holds by pickup library and itemtype.
To make it easier to understand which holds will be trapped in a given circumstance,
it would be nice if we could optionally group holds by pickup library and/or itemtype.
Test Plan:
1) Apply this patch set
2) Run updatedatabase.pl
3) Enable AllowHoldItemTypeSelection
4) Pick a record and create holds with various pickup libraries and itemtype combinations
5) Enable HoldsSplitQueueNumbering
6) Try the different combinations of HoldsSplitQueue
7) Ensure the hold "arrows" move the items correctly
* Up and down arrows should move hold above or below the adjacent hold within a hold fieldset
* Top and borrom arrows should move hold to the top or bottom within a hold fieldset
Sponsored-by: Stockholm University Library
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Followed test plan, patch worked as described. Also passed QA test tool
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Andreas Hedström Mace <andreas.hedstrom.mace at sub.su.se>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 18d85cc8d72b55880e88c5364a3819965c8a2831
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Sat Sep 30 08:03:30 2017 -0400
Bug 19469: Clean up template whitespace
Sponsored-by: Stockholm University Library
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passed QA test tool
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 83e515820abb6e2fa8ddf30f61b3f4972a48ed10
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jul 27 12:43:50 2018 +0000
Bug 21127: Remove jqTransform jQuery plugin from the OPAC
This patch removes the jqTransform jQuery plugin from the OPAC. It was
added for the CCSR theme, which no longer exists.
http://git.koha-community.org/gitweb/?p=koha.git;a=commit;h=c7c2e9efbde273f2b77786316b7502a8847072bd
There will be no visible changes to the OPAC after applying the patch.
Search the Koha codebase for references to jqTransform and confirm that
none exist.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 030047da428521c248868e3ee5d655afd3bed05b
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Mon Aug 20 07:30:45 2018 +0300
Bug 21248: Fix COinS carp in MARC details page on unknown record
Looking up a nonexistent record in the MARC details -page causes
the COinS to carp. The fix is trivial, just move the COinS call
couple lines, after the record existence check.
TEST PLAN
---------
1) reset_all for kohadevbox
2) log in to staff client - admin/admin
3) search catalogue for green
4) tweak the top URL to have a bad biblionumber (eg. 9999)
5) cat /var/log/koha/kohadev/plack-err.log
-- floody! with errors.
6) echo | sudo tee /var/log/koha/kohadev/plack-err.log
7) restart_all
8) repeat steps 2 through 5.
-- just nice starting messages, not floody.
9) run koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bf7082f854a1db9eb5b7eb77e5f450d018d8e07b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Sep 7 09:50:40 2018 +0200
Bug 13779: (QA follow-up) Correct checkauth call in offline_circ/download.pl
Script offline_circ/download.pl does not use the return values of
checkauth. So should not assign them to bad chosen variables that do
not correspond with checkauth but with get_template_and_user.
Test plan:
Look for $template, $loggedinuser, $cookie, $flags in the code.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 331af8521b5fba4b5553c182888a4017b2ce9c3a
Author: David Cook <dcook at prosentient.com.au>
Date: Thu Jul 19 16:57:22 2018 +1000
Bug 13779: sessionID declared twice in C4::Auth::checkauth()
The bug is that $sessionID is declared twice in C4::Auth::checkauth().
At the moment, this doesn't actually create a problem, because no
one seems to be using the $sessionID which is returned by checkauth(),
except in the case of opac/external/overdrive/auth.pl which skips
the second declartion as it doesn't require auth.
This patch removes the redefining of the $sessionID variable.
In terms of testing, try logging in with a username and password
and see if it works. The only risk this patch would pose is breaking
auth I would think, since nothing is actually using the return value
from checkauth() for $sessionID.
NOTE:
It was initially defined near the top of the function (~line 791).
I believe the scoping would mean the correct version of $sessionID
would be used in the latter lines for the unset'ing.
I have skimmed code to see if the sessionID return value is used.
I did not test overdrive, as I do not know how. However, this is
the only area, I think this could possibly break. This change makes
sense to me.
QA: Please test overdrive.
opac/external/overdrive/auth.pl only checks if the value is set, so
this patch might fix/break something there?
opac/svc/overdrive same kind of check.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
This is a (tiny) code improvement. Now we consistently return the session
id that is also stored in the returned cookie. (Which can be an 'anon'
session.)
Fact is that Koha almost everywhere ignores the returned session id and
sometimes gets the session from the cookie (obviously). The session id is
also passed to the template by get_template_and_user but never used in
templates.
As mentioned, the two overdrive scripts are the exception. But since both
test on both $user && $sessionID, they will not choke on an anynonomous
session id without userid. So theoretically fine, but not tested.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 68138b225807a857ddbddef7680c43f2b10de87e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Sep 7 11:33:44 2018 +0000
Bug 21324: Fix column defs and spans
TO test:
1 - Open a bastket in acquisitions
2 - Order some items
3 - Close the basket
4 - Receive some items
5 - Note the columns are out of alingment on parcel.pl
6 - Note a JS error breaking datatable on 'Already received'
7 - Apply patch
8 - Things should be better
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 235654a3cfa5b6e323489408ddc7875281bb1f50
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Aug 29 13:46:39 2018 -0300
Bug 21285: Add missing select2x2.png file
This file is part of the Select2 jquery plugin, but wasn't added when
the use of the plugin was introduced in Koha.
To test:
- On a high DPI screen (retina mac?) on Chrome or Safari
- Edit an item
=> FAIL: dropdowns using Select2 (like 'Shelving location') don't display the icons (down arrow and cross) and a default value is wrongly selected
=> FAIL: the inspector says the requested select2x2.png file returned a 400 error.
- Apply this patch
- Reload the edit page
=> SUCCESS: Things display correctly! Dropdowns without selected values
by default!
=> SUCCESS: No errors fetching select2x2.png
- Sign off :-D
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3fedae85f25ef5f587d567b51b86aab776d87311
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jul 23 11:14:47 2018 -0300
Bug 21116: Add API routes through plugins
This patch adds plugins the capability of injecting new routes on the
API.
The plugins should provide the following methods to be considered valid API-generating plugins:
- 'api_routes': returning the 'path' component of the OpenAPI specification corresponding to the routes served by the plugin
- 'api_namespace': it should return a namespace to be used for grouping the endpoints provided by the plugin
otherwise, they will be just skipped.
All plugin-generated routes will be added the 'contrib' namespace, and
will end up placed inside /contrib/<namespace>, where <namespace> is what the 'api_namespace' returns.
A sample endpoint will be added to the Kitchen Sink plugin, and tests
are being written.
To test:
- Apply this patches
- Run:
$ kshell
k$ prove t/db_dependent/Koha/REST/Plugin/PluginRoutes.t
=> SUCCESS: Tests pass!
- Install the (latest) KitchenSink plugin
- Point your browser to the API like this:
http://koha-intra.myDNSname.org:8081/api/v1/.html
=> SUCCESS: The /contrib/kitchensink/patrons/:patron_id/bother endpoint
implemented by the plugin has been merged!
- Sign off! :-D
Signed-off-by: Benjamin Rokseth <benjamin.rokseth at deichman.no>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 46c992948ea28ae2bebc7f9042df6434319b80bf
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Aug 27 16:24:09 2018 -0300
Bug 21116: Unit tests
This path implements unit tests for the route-from-plugin development.
It adds the required methods to the Koha::Plugin::Test plugin
distributed along with the tests. A second plugin implementing invalid
OpenAPI specs is added (Koha::Plugin::BadAPIRoute).
Edit: I made terminology changes to make it less rude.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit be0a897648e4ae1ebb429d0829c22a8534a81606
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 10 13:45:32 2018 -0700
Bug 7534: (QA follow-up) Use Koha.Preference template plugin to fetch the pref's value
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 2 +-
C4/Reserves.pm | 25 +-
Koha.pm | 2 +-
Koha/Exceptions/Password.pm | 92 +++++
Koha/Exceptions/Plugin.pm | 84 +++++
Koha/REST/Plugin/PluginRoutes.pm | 140 ++++++++
Koha/REST/V1.pm | 37 +-
catalogue/MARCdetail.pl | 3 +-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 11 +
.../intranet-tmpl/lib/select2/css/select2x2.png | Bin 0 -> 845 bytes
.../intranet-tmpl/prog/css/src/staff-global.scss | 8 +
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../intranet-tmpl/prog/en/includes/holds_table.inc | 199 +++++++++++
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 9 +-
.../en/modules/admin/preferences/circulation.pref | 14 +
.../prog/en/modules/members/housebound.tt | 4 +-
.../prog/en/modules/reserve/request.tt | 319 +++++++----------
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 4 +-
.../jquery/plugins/jquery.jqtransform_select.js | 366 --------------------
offline_circ/download.pl | 3 +-
opac/opac-reserve.pl | 7 +-
reserve/request.pl | 11 +-
t/Koha/Exceptions.t | 22 +-
t/db_dependent/Holds.t | 8 +-
t/db_dependent/Koha/REST/Plugin/PluginRoutes.t | 83 +++++
t/lib/Koha/Plugin/BadAPIRoute.pm | 92 +++++
t/lib/Koha/Plugin/Test.pm | 65 ++++
28 files changed, 1007 insertions(+), 606 deletions(-)
create mode 100644 Koha/Exceptions/Password.pm
create mode 100644 Koha/Exceptions/Plugin.pm
create mode 100644 Koha/REST/Plugin/PluginRoutes.pm
create mode 100644 koha-tmpl/intranet-tmpl/lib/select2/css/select2x2.png
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
delete mode 100644 koha-tmpl/opac-tmpl/lib/jquery/plugins/jquery.jqtransform_select.js
create mode 100644 t/db_dependent/Koha/REST/Plugin/PluginRoutes.t
create mode 100644 t/lib/Koha/Plugin/BadAPIRoute.pm
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list