[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.03-23-g31db081
Git repo owner
gitmaster at git.koha-community.org
Mon Sep 17 15:59:36 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, 18.05.x has been updated
via 31db0813d36f21a0c898b75841a3e34364619a84 (commit)
via 9f221f9ae8b16846bd3b9b35b19d4b5434050f95 (commit)
via 903b880f330026d476d761901a2099972159a94c (commit)
via 7fe692bf0ec4dd6744c81c068c400927ccc0c54d (commit)
via ee2d5ae04dc4c5fed9f09c9067c3de0037cdba8e (commit)
via 89f6aacecc787affd07856d6c092f21bacab7993 (commit)
via 637469974c3290a43ac259642df0fefdfe2d369f (commit)
from 3017d592a10da23fc12e6a94ba70d7ff9e7d7d94 (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 31db0813d36f21a0c898b75841a3e34364619a84
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Sep 14 11:53:37 2018 +0200
Bug 19179: (QA follow-up) Replace second E-mail
Better write here exactly what we need to type in the pref text box.
Since E-mail will not work and Email will :)
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 b0ef7174fe601bbf39408e455365ea563949b4bb)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9f221f9ae8b16846bd3b9b35b19d4b5434050f95
Author: Charlotte Cordwell <charlotte.cordwell123 at gmail.com>
Date: Fri Sep 7 03:35:36 2018 +0000
Bug 19179: Email option for SMSSendDriver is not documented
'Email' is not documented as a valid setting.
1) Apply patch.
2) Go to Administration --> search SMSSendDriver
3) Check if SMSSendDriver has this message is at the end of the box:
"If you would prefer to receive SMS via E-mail set SMSSendDriver to Email"
Signed-off-by: Michal Denar <black23 at gmail.coml>
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 2d6cf8bd7a0e290c8bb947ed1880f1e906d0e74c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 903b880f330026d476d761901a2099972159a94c
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>
(cherry picked from commit 83e515820abb6e2fa8ddf30f61b3f4972a48ed10)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7fe692bf0ec4dd6744c81c068c400927ccc0c54d
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>
(cherry picked from commit 030047da428521c248868e3ee5d655afd3bed05b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ee2d5ae04dc4c5fed9f09c9067c3de0037cdba8e
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>
(cherry picked from commit bf7082f854a1db9eb5b7eb77e5f450d018d8e07b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 89f6aacecc787affd07856d6c092f21bacab7993
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>
(cherry picked from commit 331af8521b5fba4b5553c182888a4017b2ce9c3a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 637469974c3290a43ac259642df0fefdfe2d369f
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>
(cherry picked from commit 235654a3cfa5b6e323489408ddc7875281bb1f50)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 2 +-
catalogue/MARCdetail.pl | 3 +-
.../intranet-tmpl/lib/select2/css/select2x2.png | Bin 0 -> 845 bytes
.../prog/en/modules/admin/preferences/patrons.pref | 2 +
.../jquery/plugins/jquery.jqtransform_select.js | 366 --------------------
offline_circ/download.pl | 3 +-
6 files changed, 6 insertions(+), 370 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/lib/select2/css/select2x2.png
delete mode 100644 koha-tmpl/opac-tmpl/lib/jquery/plugins/jquery.jqtransform_select.js
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list