[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.05-13-gab23d13
Git repo owner
gitmaster at git.koha-community.org
Mon Mar 27 15:04:03 CEST 2017
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, 16.11.x has been updated
via ab23d1368343ad115a5072f7264b99c7bee68675 (commit)
via bdae6c9492ea8db223c03753090060592a330be7 (commit)
via 108853352a87c3493612ec29e305dcc5997fe69c (commit)
via 74fe3f5cda7cac22640f9ae3d68b3d62a6765dc0 (commit)
via 1161a67476b5b61358fdaecca57b012e663a7b02 (commit)
via fd1f24487a73a721f5318608fb09c47a2bea2e1b (commit)
via fac1ccd9b2f2ce5fd61ea842eb622b8f70e613f0 (commit)
via b294550ac6db804193928af798500e18d83de9db (commit)
via 50483ff17cd2b6223c9fa3a2844195a57fc95160 (commit)
via 95bccfbbb8f2b0d0de064ae34dca24e3d59852a4 (commit)
via 34a91f6e3d7da38aafb37a57a962c1d852f9101a (commit)
via 4f57d8ccea9033cc3b6d17d69f3ac6d982877b6d (commit)
via b3939f6f659fa3a409639441c24a5d5d6a73a6a3 (commit)
from d3ef053c415fdab3ab59310cb4d058f6a0c50e77 (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 ab23d1368343ad115a5072f7264b99c7bee68675
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 9 12:44:38 2017 +0100
Bug 15854: Use a READ and WRITE LOCK on message_queue
To make sure we will not never get a race conditions for these kinds of
notices, we need to add a LOCK on the message_queue table.
This does not smell the best way to do that, but I faced deadlock issues
when I tried to use "UPDATE FOR"
https://dev.mysql.com/doc/refman/5.7/en/innodb-locking-reads.html
https://dev.mysql.com/doc/refman/5.7/en/lock-tables.html
https://dev.mysql.com/doc/refman/5.7/en/commit.html
To test this patch, or another solution, you need to apply manually this
change:
my $message = C4::Message->find_last_message($borrower, $type, $mtt);
unless ( $message ) {
+ sleep(1);
C4::Message->enqueue($letter, $borrower, $mtt);
} else {
And repeat the test plan from first patch.
Do not forget to truncate the message_queue table.
Followed test plans, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit be156d9ad9e5bcfadab34d44f90e04fd61e256ad)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit bdae6c9492ea8db223c03753090060592a330be7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 9 12:13:07 2017 +0100
Bug 15854: Simplify the code to limit race conditions
There is an obvious race condition when CHECKIN and RENEWAL are
generated from circulation.pl calling svc/renew or svc/checkin in AJAX.
The 2 first queries will try to get the id of the last message
(find_last_message) and if it does not exist, they will insert it.
Theorically that could be lead to have several "digest" messages for a
given patron.
I did not recreate more than 2 messages, from the third one at least one
of the two firsts existed in the DB already.
This patch just simplifies the code to make the SELECT and INSERT or
UPDATE closer and limit the race condition possibilities.
Test plan:
0. Set RenewalSendNotice and circ rules to have a lot of renewals available
1. Use batch checkouts (or one by one) to check out several items to a
patron
2. Empty message_queue (at least of this patron)
3. Renew them all at once ("select all" link, "renew or check in"
button)
4. Check the message_queue
Without this patch you have lot of chances to faced a race condition and
get at least 2 messages for the same patron. This is not expected, we
expect 1 digest with all the messages.
With this patch apply you have lot of chances not to face it, but it's
not 100% safe as we do not use a mechanism to lock the table at the DBMS
level.
Tested both patches together, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 607b14516a955c9989e4764c69527edbc1f36ba0)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 108853352a87c3493612ec29e305dcc5997fe69c
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Wed Nov 9 14:37:33 2016 +0000
Bug 17605: [STABLE] Add currency to orders generated by quotes
Sets the vendors currency in the edi generated order
The currency used is agreed between vendor and library
and the value in the quote is optional
Edifact potentially allows the currency to be overwitten
by specifying another currency in the CUX segment but
we know currently of no supplier doing this
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit 74fe3f5cda7cac22640f9ae3d68b3d62a6765dc0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sun Jan 29 15:40:14 2017 +0100
Bug 18010: Remove potential exposure from gettemplate
A similar bad template check from C4::Auth::get_template_and_user
should be applied in C4::Templates::gettemplate.
Before this patch it would be possible to expose files like:
my $template = C4::Templates::gettemplate(
'/etc/passwd', 'intranet', CGI::new, 1
);
print $template->output;
Note that the is_plugin flag in the above call is the culprit. This patch
provides a quick security fix without touching get_template_and_user, and
can be backported to stable branches.
I will provide an enhanced and centralized check on report 17989, also
removing the is_plugin flag.
Note: We allow .pref here too for use in admin/preferences.pl.
Test plan:
[1] Run t/db_dependent/Auth.t (triggering get_template_and_user and
gettemplate).
[2] Run t/db_dependent/Templates.t again (see first test plan).
The tests should no longer fail.
[3] Open a page on opac or intranet.
[4] Open a systempreferences tab.
[5] Add a book to the cart and send it ([opac-]sendbasket uses gettemplate).
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit fbbd4b40f0d71b79194fc186e66f985488be26c6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1161a67476b5b61358fdaecca57b012e663a7b02
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sun Jan 29 15:52:22 2017 +0100
Bug 18010: Unit test for gettemplate
A trivial test, similar to the ones in Auth.t.
Without the check in gettemplate (added in the second patch), the passwd
file will be exposed and the test fails.
Test plan:
Run t/db_dependent/Templates.t without second patch. The two tests in the
last subtest should fail.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 5508897d5a2b73c30d50fed26a6bfed62bf49398)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Conflicts:
t/db_dependent/Templates.t
commit fd1f24487a73a721f5318608fb09c47a2bea2e1b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 1 12:42:43 2017 +0100
Bug 18028: Remove outdated install_misc directory
This directory is no longer maintained and contain outdated information
on how to install Koha.
On the Internet there are tutos using them and that can create confusion
to new user (yes it could be confusing as well to execute a file that
does no longer exist).
NOTE: last tweak was mid 2016, but before that 2015. So I agree with
the deletion.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit a6f50cbcb92c2575eb31e906ea54bf0386654906)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit fac1ccd9b2f2ce5fd61ea842eb622b8f70e613f0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 7 09:10:42 2017 +0100
Bug 18069: Remove residue of rebuild_zebra -x
Bug 17731 removed the -x option of rebuild_zebra but koha-rebuild-zebra
still cals the script with this option.
"Warning: You passed -x which is already the default and is now deprecated"
Test plan:
sudo koha-rebuild-zebra -f
should no longer raise the warning
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit fe898bc641b6d76d7b869654dce4ec21e219daf8)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b294550ac6db804193928af798500e18d83de9db
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 14 15:22:40 2017 +0000
Bug 18094: Only search in searchable patron attributes if searching in standard fields
Test plan:
- Add a new patron attrbute and mark it searchable
- Populate a new patron with 'potato' in that field
- Add/edit another patron to have email potato at invalidemail.com'
- Perform a patron search with query 'potato' (in standard fields)
=> Both patrons are returned
- Perform a patron search with filters 'Email' and query 'potato'
=> Only 1 patron is returned and you are redirected to the patron detail page.
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 5823d4ca6a71404d502eeb7f1bf5dd152fd98e22)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 50483ff17cd2b6223c9fa3a2844195a57fc95160
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 14 16:19:25 2017 +0100
Bug 18094: Add tests to highlight the problem
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit f86500351af0a1a4d1593eb2aa689b8ec52bc401)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 95bccfbbb8f2b0d0de064ae34dca24e3d59852a4
Author: Marc Véron <veron at veron.ch>
Date: Sat Mar 11 19:17:37 2017 +0100
Bug 18246: Patron card creator: Unit not always displays properly in layouts
To reproduce:
1) Create a new layout
2) Select an unit in "Units selection"
3) Save
4) Edit layout again
5) Select other unit, e.g. 'SI Centimeter'
6) Save
7) Repeat
8) Edit again
Error: Latest unit seems to stick and can no longer be changed, because
in units drop down, multiple untis are marked as selected.
To test:
1) Apply patch
2) Repeat steps above, verify that value for units always display as expected.
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 37da40b323d8bc012724510fe4839dcb908c2b3b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 34a91f6e3d7da38aafb37a57a962c1d852f9101a
Author: Marc Véron <veron at veron.ch>
Date: Sat Mar 11 17:18:10 2017 +0100
Bug 8603: Patron card creator - 'Barcode Type' doesn't stick in layouts
To reproduce:
1. Make a new layout
2. Tick "Print card number as barcode"
3. Change 'Barcode Type' to anything other than Code39
4. Save
5. Edit it again
6. Its back to Code39
To test:
1. Apply patch
2. Repeat steps above
3. Verify that 'Barcode type' is selected as expected
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
https://bugs.koha-community.org/show_bug.cgi?id=18063
https://bugs.koha-community.org/show_bug.cgi?id=8063
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 20ad341eefc555e0cf2b0f2862347e8a48b28935)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 4f57d8ccea9033cc3b6d17d69f3ac6d982877b6d
Author: Nicolas Legrand <nicolas.legrand at bulac.fr>
Date: Wed Feb 22 10:11:18 2017 +0100
Bug 18150 - CanItemBeReserved doesn't work with (IndependentBranches AND ! canreservefromotherbranches)
The variable $item used to be a hash, but at the end of the function,
it's a Koha object. As $item->{homebranch} doesn't yield anything and
should be $item->homebranch. It prevents people using different
branches without holds between branches from placing a hold on an item
they should be able to place hold on.
Test plan:
1. Before patch
a. with IndependantBranches off
b. try to place hold on an item you should be able to place hold on
c. it should work
d. put IndependantBranches on and canreservefromotherbranches off
e. shouldn't work
2. after patches redo steps from (1) and everything should be working
fine.
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Note: Item is fetched twice, it's not necessary. But out of the scope of
this patch.
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit f79cf7930d887ea157fa64bb89fb0eb130b74aae)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b3939f6f659fa3a409639441c24a5d5d6a73a6a3
Author: David Gustafsson <david.gustafsson at ub.gu.se>
Date: Mon Mar 20 15:13:13 2017 +0100
Bug 18305 - jquery.fixFloat.js breaks advanced MARC editor
Remove use of ECMASCRIPT 2015 default parameter syntax in
jquery.fixFloat.js to be compatible
with a wider range of browser versions.
Test plan:
1. Usa a not so modern browser, for example Chrome/Chromium < 49, any version of IE
besides Edge, Opera, or Firefox < 15.0.
2. Edit a bibliographic record in staff client and try switching to
advanced MARC editor (check console, no errors should appear).
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit a649958315c98500ebe0ea3f91c05a8067d54e58)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 64 +++----
C4/Reserves.pm | 2 +-
C4/Templates.pm | 1 +
C4/Utils/DataTables/Members.pm | 2 +-
Koha/EDI.pm | 2 +
debian/scripts/koha-rebuild-zebra | 8 +-
install_misc/UpgradeBackup.pm | 94 ----------
install_misc/debian.packages | 148 ---------------
install_misc/environment_Makefile.PL | 80 --------
install_misc/ubuntu-packages.sh | 194 --------------------
install_misc/ubuntu.10.04.packages | 163 ----------------
install_misc/ubuntu.12.04.packages | 168 -----------------
install_misc/ubuntu.packages | 168 -----------------
.../lib/jquery/plugins/jquery.fixFloat.js | 3 +-
patroncards/edit-layout.pl | 6 +-
t/db_dependent/Templates.t | 14 +-
t/db_dependent/Utils/Datatables_Members.t | 31 +++-
17 files changed, 82 insertions(+), 1066 deletions(-)
delete mode 100644 install_misc/UpgradeBackup.pm
delete mode 100644 install_misc/debian.packages
delete mode 100644 install_misc/environment_Makefile.PL
delete mode 100755 install_misc/ubuntu-packages.sh
delete mode 100644 install_misc/ubuntu.10.04.packages
delete mode 100644 install_misc/ubuntu.12.04.packages
delete mode 100644 install_misc/ubuntu.packages
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list