[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.10-44-gd9d868b
Git repo owner
gitmaster at git.koha-community.org
Thu Oct 11 15:26:42 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 d9d868b911d1ba18c2bac1993e407168164df168 (commit)
via 6c45261cb4b9453e5ec189340da0e6495a4d2663 (commit)
via 181e84814771dff45d523de73e8972d7c0150987 (commit)
via 4c9711e16686476b65d7ee56e850da45bc2c2807 (commit)
via 17aef6ad28229ec68176246a06a3d8291d1618ef (commit)
via 232a7a30666cc3082ae4e7b6b4828aef3e9c0039 (commit)
via d951f0906b4edf0543be89b657e9f7bf24b9fa90 (commit)
via b60e0ca2885817446d6649e4250bbf6af7fa75d4 (commit)
via f2f10001fc3487b003b90e7d8ba00bbfe3ec0a89 (commit)
from 42046e95ab8b9b33311c29c3611054343e0d0e68 (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 d9d868b911d1ba18c2bac1993e407168164df168
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Aug 10 05:21:56 2018 +0200
Bug 15971: Add biblioitems to available fields for serial claim notices and fix notices editor display
This fixes 2 related problems:
1) The editor only offered 3 entries from biblio for adding to the notice:
title, author, serial
It was not clear that actually all fields from biblio can be used.
2) It was not possible to use fields from biblioitems in the notices
which left out important fields like the ISSN.
The patch adds the biblioitems table and changes the editor to show
all entries from biblio and biblioitems table are shown on the left.
To test:
- Create a subscription
- Generate next issue a few times to get late issues
- Create a new notice in the "Claim serial issue" module
- Use fields from different/all tables
- Make sure an email address is set for
- the vendor (also check for 'receives claims for late issues')
- your staff user
- Go to serials > claims
- Claim multiple issues
- Verify the email is generated and contains the correct information
Example notice:
Title: <<biblio.title>>
Author: <<biblio.author>>
ISSN: <<biblioitems.issn>>
ISBN: <<biblioitems.isbn>>
Issue: <<serial.serialseq>>
--
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit a002d12888c1e56910a32f28514a59d9a1d9363d)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 00422bf33f48c95aac0dc639e42fe958d0de133b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 6c45261cb4b9453e5ec189340da0e6495a4d2663
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu Sep 27 12:25:28 2018 +0100
Bug 21425: Display basketno correctly in Order error msg
carp will display the hash value instead of the desired basketno
in the error message unless we change its behaviour
Use the simpler but effective option of concatenating
the errormessage with the basketno. Error is shown if no
sender or receipient ean is passed in instantiating
an Koha::Edifact::Order object
Signed-off-by: Kyle M Hall <kyle 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 e81756b317da848a6e6346a7c0db8f3b986f7058)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit f7088ecf4b752f3e61e94ff4738fb04b97d574d2)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 181e84814771dff45d523de73e8972d7c0150987
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Sep 26 22:57:32 2018 +0000
Bug 13272: (follow-up) add missing type="text"
This addresses comment #13.
This also applies cleanly.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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 623f1db90ac8d0361a879813c66a4bccbf0ea23e)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 721cefdb95ba6d3f8fb59f6b02255cd76d8a3fbf)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4c9711e16686476b65d7ee56e850da45bc2c2807
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Sep 19 18:49:02 2018 +0000
Bug 13272: (follow-up) Replace tabs with spaces
Cleaned up whitespace issues tab vs. space in template.
After applying all patches:
git diff -w origin/master
For the koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
only the changed type="text" lines will show, but without the
-w, there will be more whitespace changes.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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 5edd363a1f2e3b1ea34f3f2aa7ace86cbf467df8)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 73b197df9ed8e038684e1821ab4d9090d7af225a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 17aef6ad28229ec68176246a06a3d8291d1618ef
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Sep 19 16:48:13 2018 +0000
Bug 13272: (follow-up) fix concerns from comment #5
Correct the two issues I pointed out.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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 77871b408c9a8e120f8415cc0b32683ee8f57e7d)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 49158f3369617b9a4ad8d247308f2a4aea653cde)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 232a7a30666cc3082ae4e7b6b4828aef3e9c0039
Author: Christopher Brannon <cbrannon at cdalibrary.org>
Date: Sun Sep 16 22:06:10 2018 +0000
Bug 13272: Adds type="text" to inputs missing it
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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 92a2d74c1c134674b9798981208b9ad5863a6b42)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 5fbbdb915f9a41070ff71aac902622f0a7bb5ef7)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d951f0906b4edf0543be89b657e9f7bf24b9fa90
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Aug 30 10:52:43 2018 +0100
Bug 21289: Fix "isa" bug during partner request
We cannot call 'handle_commit_maybe' inside a 'try' block.
handle_commit_maybe redirects the client then calls 'exit', this is
interpreted as an error and the 'catch' block is erroneously called.
This patch moves the calling of 'handle_commit_maybe' outside the try
block, it will only be reached if everything inside the try block
suceeds.
To test:
1) Enable ILL and have the FreeForm backend available
2) Create a patron category to hold ILL "partners" to whom requests can
be sent. The category can be called anything, you should note the code
you assign
3) Create a patron that belongs to your new category, the patron must
have a primary email defined.
4) In your <interlibrary_loans> block in koha-conf.xml, ensure you have
a <partner_code> element, it should contain the code you assigned in
step 2
5) Create an ILL request using the FreeForm backend
6) Once the request is created, select the "Place request with partners"
button
7) Select your "partner" from the "Select partner libraries" box
8) Click "Send email"
9) TEST: Observe no errors are displayed in the UI
Signed-off-by: Barry Cannon <bc at interleaf.ie>
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 fca5a1cb3dba5d6561eaf5f30dfd4d996a4042cc)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 6bf50445b151ef94e6100da482e5826458a5136b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b60e0ca2885817446d6649e4250bbf6af7fa75d4
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Jun 7 22:48:57 2016 -0400
Bug 16690: Simplify SHOW GRANTS to work when connected
If the DB is on a remote machine, the web server and the
db server are different, but the SHOW GRANTS code in
installer/install.pl is trying to use the SAME machine.
And even if the permissions were allowed accessing from
both the web and db servers, MySQL won't return the
SHOW GRANTS without access to the mysql.user table. To
install *.* permissions became easiest to get working.
Unless the DB is set up with 'user'@'%', which is also a
potential security issue.
MySQL / MariaDB allow the current connected user to
check their own grants with CURRENT_USER.
There is no need for the installer to know the
IP address of the webserver.
This also removes the need to have permissions for
'koha_kohadev'@'%', because the only process to be
accessing the koha DB is from a known host/ip.
This tightens security too.
TEST PLAN
---------
Install 2 fresh VMs from a Debian ISO.
Make sure they are on the same network (192.168.50.x) as
the kohadevbox. You will need to remember one as DB_IPADDRESS.
On the DB VM & Third VM:
sudo apt-get install mariadb-server mariadb-client net-tools
-- the third vm just needs to be able to run mysql to access
the DB VM.
On DB VM:
sudo vi /etc/mysql/mariadb.conf.d/50-server.cnf
-- make sure the bind-address line is commented out with a #
sudo service mariadb restart
-- congratulations, your DB server is listening to remote
calls now.
sudo mysql -u root
CREATE DATABASE koha_kohadev;
GRANT ALL PRIVILEGES ON `koha_kohadev`.* TO 'koha_kohadev'@'localhost' IDENTIFIED BY 'password';
FLUSH PRIVILEGES;
-- now you have an empty DB ready to run a web install on.
However, because only koha_kohadev from localhost is
allowed, we expect failure when we try to run the web
installation step when we get there.
Let's confirm that everything is working as expected
before trying. It will also demonstrate the reason why
this patch is superior to the existing code.
On a kohadevbox:
mysql -u koha_kohadev -h DB_IPADDRESS -p
-- this should be denied
On DB VM:
DROP USER 'koha_kohadev'@'localhost';
GRANT ALL PRIVILEGES ON `koha_kohadev`.* TO 'koha_kohadev'@'%' IDENTIFIED BY 'password';
FLUSH PRIVILEGES;
On a kohadevbox:
mysql -u koha_kohadev -h DB_IPADDRESS -p
-- this should give you a SQL prompt
SHOW GRANTS FOR CURRENT_USER;
-- this should show two lines based on 'koha_kohadev'@'%';
SHOW GRANTS FOR 'koha_kohadev'@'192.168.50.10';
-- this should give an access denied error.
SHOW GRANTS FOR 'koha_kohadev'@'%';
-- this should show two lines based on 'koha_kohadev'@'%';
QUIT
-- This case requires the unless code currently in place,
because we aren't checking CURRENT_USER.
On DB VM:
DROP USER 'koha_kohadev'@'%';
GRANT ALL PRIVILEGES ON `koha_kohadev`.* TO 'koha_kohadev'@'192.168.50.10' IDENTIFIED BY 'password';
FLUSH PRIVILEGES;
On a kohadevbox:
mysql -u koha_kohadev -h DB_IPADDRESS -p
-- this should give you a SQL prompt
SHOW GRANTS FOR CURRENT_USER;
-- this should show two lines based on 'koha_kohadev'@'%';
SHOW GRANTS FOR 'koha_kohadev'@'192.168.50.10';
-- this should show two lines based on 'koha_kohadev'@'192.168.50.10';
SHOW GRANTS FOR 'koha_kohadev'@'%';
-- this should give an access denied error.
QUIT
-- This case demonstrates that we have two failure points:
1) The GRANT command by the DB Admin and
2) The koha-conf.xml setting.
This is why CURRENT_USER is superior: only (2) is the
failure point.
On DB VM:
GRANT ALL PRIVILEGES ON `koha_kohadev`.* TO 'koha_kohadev'@'%' IDENTIFIED BY 'password';
FLUSH PRIVILEGES;
SELECT host,user FROM mysql.user;
-- Should see both koha_kohadev for 192.168.50.10 and %.
On a kohadevbox:
mysql -u koha_kohadev -h DB_IPADDRESS -p
-- this should give you a SQL prompt
SHOW GRANTS FOR CURRENT_USER;
-- this should show two lines based on 'koha_kohadev'@'192.168.50.10';
SHOW GRANTS FOR 'koha_kohadev'@'192.168.50.10';
-- this should show two lines based on 'koha_kohadev'@'192.168.50.10';
SHOW GRANTS FOR 'koha_kohadev'@'%';
-- this should give an access denied error.
QUIT
-- This case doesn't need the unless. CURRENT_USER still
just works.
On an third VM on the same network:
mysql -u koha_kohadev -h DB_IPADDRESS -p
-- this should give you a SQL prompt
SHOW GRANTS FOR CURRENT_USER;
-- this should show two lines based on 'koha_kohadev'@'%';
SHOW GRANTS FOR 'koha_kohadev'@'192.168.50.10';
-- this should give an access denied error.
SHOW GRANTS FOR 'koha_kohadev'@'%';
-- this should show two lines based on 'koha_kohadev'@'%';
QUIT
-- This case demonstrates that it may be more open than a DB
administrator would prefer. And notice, CURRENT_USER still
just works.
On DB VM:
DROP USER 'koha_kohadev'@'192.168.50.10';
DROP USER 'koha_kohadev'@'%';
GRANT ALL PRIVILEGES ON *.* TO 'koha_kohadev'@'%' IDENTIFIED BY 'password';
FLUSH PRIVILEGES;
-- This basically give koha_kohadev free reign to do pretty
dangerous stuff.
On an third VM on the same network:
mysql -u koha_kohadev -h DB_IPADDRESS -p
-- this should give you a SQL prompt
SHOW GRANTS FOR CURRENT_USER;
-- this should show a line based on 'koha_kohadev'@'%';
SHOW GRANTS FOR 'koha_kohadev'@'192.168.50.10';
-- this should give a no such grant error.
SHOW GRANTS FOR 'koha_kohadev'@'%';
-- this should show two lines based on 'koha_kohadev'@'%';
QUIT
-- This case demonstrates that it may be more open than a DB
administrator would prefer. And notice, CURRENT_USER still
just works.
In the old code, both cases were literally checked.
This tweak is an optimization which doesn't require
setting permissions to the mysql.user table. Without it,
the code says the user doesn't have permissions to check
the show grants. This issue is not visible to the user,
because both cases are checked.
On DB VM:
SELECT host,user FROM mysql.user;
-- for each one do an appropriate DROP USER 'user'@'host';
GRANT ALL PRIVILEGES ON `koha_kohadev`.* TO 'koha_kohadev'@'192.168.50.10' IDENTIFIED BY 'password';
On kohadevbox:
-- Make sure the /etc/koha/sites/kohadev/koha-conf.xml
points to the DB VM.
-- Make sure a web install runs correctly
On third VM:
-- Make sure unable to connect as koha_kohadev/password.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
I have not followed the whole test plan but trusting author and SO
Changes make sense to me
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 013c116d59b14681bff1c18c9225ea4e31627a28)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 67a491a73f0dea1182c937aa424491210a0d0d8b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit f2f10001fc3487b003b90e7d8ba00bbfe3ec0a89
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Thu Sep 27 07:54:27 2018 +0300
Bug 21416: 'gr' option missing from ZEBRA_LANGUAGE options in koha-sites.conf
'gr' (as in 'Greek') is missing from the ZEBRA_LANGUAGE options
in debian/templates/koha-sites.conf. This patch fixes that.
Test plan:
1) view koha-sites.conf and notice how 'gr' is missing from the
ZEBRA_LANGUAGE options
2) apply the patch
3) observe that koha-sites.conf now includes 'gr' as an option
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 705571a2b870fbb652ca210e32ee3e7ca050e75f)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 93b7683780ba6c79ce22307c8c8cbd31f3c73a56)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Letters.pm | 9 +-
Koha/Edifact/Order.pm | 8 +-
debian/templates/koha-sites.conf | 2 +-
ill/ill-requests.pl | 12 ++-
installer/install.pl | 30 +-----
.../intranet-tmpl/prog/en/includes/adv-search.inc | 4 +-
.../prog/en/includes/borrower_debarments.inc | 2 +-
.../intranet-tmpl/prog/en/includes/cat-search.inc | 5 +-
.../prog/en/includes/cataloging-search.inc | 4 +-
.../prog/en/includes/checkin-search.inc | 2 +-
.../intranet-tmpl/prog/en/includes/circ-search.inc | 4 +-
.../intranet-tmpl/prog/en/includes/home-search.inc | 4 +-
.../prog/en/includes/patron-search.inc | 4 +-
.../prog/en/modules/acqui/z3950_search.tt | 2 +-
.../prog/en/modules/admin/smart-rules.tt | 4 +-
.../en/modules/cataloguing/z3950_auth_search.tt | 2 +-
.../prog/en/modules/cataloguing/z3950_search.tt | 2 +-
.../prog/en/modules/circ/branchtransfers.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/offline.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 18 ++--
.../prog/en/modules/clubs/templates-add-modify.tt | 18 ++--
.../prog/en/modules/members/memberentrygen.tt | 2 +-
.../prog/en/modules/members/paycollect.tt | 6 +-
.../prog/en/modules/reserve/request.tt | 4 +-
.../prog/en/modules/tools/import_borrowers.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +-
.../bootstrap/en/modules/opac-shareshelf.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 5 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 +-
t/db_dependent/Letters.t | 96 +++++++++++++++++++-
tools/letter.pl | 10 +-
34 files changed, 177 insertions(+), 106 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list