[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.05-101-gbe3fec7
Git repo owner
gitmaster at git.koha-community.org
Fri Nov 9 17:51:46 CET 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 be3fec7132e015f241fa0f1ef95e0b95eebaaee8 (commit)
via e1783e2c4adbce67642b264e5a14f14ac21e1a13 (commit)
via da971a81da893ca625d78b172ccab8f4131a8664 (commit)
via f4be5e5db3e76ee74c7c581808046f47964c8615 (commit)
via b5148f412b741d1342c564360c690f14c9be6b94 (commit)
via 4f239147fc240d1f8caa49d3722b712758b9ed77 (commit)
via 45539696c16669dbc26810e403fccba48c2129f1 (commit)
via 18bb4d5e66f4bfc74144bce2f730359b55526b08 (commit)
via ec7e569d55575f26ba481684ff157c8ec3985002 (commit)
via 776423df10e6237be78420ef63e1a53694cb884d (commit)
via 77969527962b4f8c098b59f50989bbea26831803 (commit)
via 1ee7a438b2dc18e2a202795bb4203b58a0c36674 (commit)
from 3557009b1668f9fbc20222fd4c2351b99beee5b8 (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 be3fec7132e015f241fa0f1ef95e0b95eebaaee8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 18 18:10:19 2018 -0300
Bug 21604: Fix add/edit fund/budget
[Strict SQL modes context]
For insert aqbudgetperiods:
Incorrect integer value: '' for column 'budget_period_id'
For insert/update aqbudgets
Incorrect integer value: '' for column 'budget_owner_id'
Incorrect decimal value: '' for column 'budget_encumb'
Test plan:
Add/edit budgets and funds
A good example of why we should use Koha::Object for all our objects
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.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 7085772e8de25fe49b77555e318cc03ab6bcb33b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e1783e2c4adbce67642b264e5a14f14ac21e1a13
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Nov 2 07:44:34 2018 +0100
Bug 21604: Add two trivial test cases
Adding an id in AddBudgetPeriod and an empty string in AddBudget for
budget_encumb.
Test plan:
Run Budgets.t with/without this patch in strict sql mode.
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 433fc3f120cfa08fda1dd55a7db721bdf3bf1e9b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit da971a81da893ca625d78b172ccab8f4131a8664
Author: Magnus Enger <magnus at libriotech.no>
Date: Tue Oct 16 21:25:43 2018 +0200
Bug 21585: Ignore missing firstname in ILL requests table
To test:
- Make sure you have a patron with just a surname and no firstname
- Create an ILL request so that the name of this patron shows up in
the Patron column of the ILL requests table
- Before the patch, the name will display as "null Surname"
- Apply the patch
- Reload the ILL requests page
- The name should now display as just "Surname"
- Sign ye merrily off
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5ea877f6cba299373e0ebb9c59f8797baba98bec)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f4be5e5db3e76ee74c7c581808046f47964c8615
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 29 18:16:19 2018 -0300
Bug 21717: Fix generation of real's values
With strict SQL modes we now have TestBuilder tests that fail randomly with:
Out of range value for column 'tax_rate_on_receiving'
Out of range value for column 'discount'
We are trying to insert a value that is too high for the type defined at DB level.
It happens for discount when a value > 100 is generated. The datatype is float(6,4).
From the MySQL Doc:
"""
MySQL permits a nonstandard syntax: FLOAT(M,D) or REAL(M,D) or DOUBLE PRECISION(M,D).
Here, (M,D) means than values can be stored with up to M digits in total, of which D digits may be after the decimal point.
"""
So float(6,4) does not allow 100.
To recreate easily the issue:
use t::lib::TestBuilder;
my $builder = t::lib::TestBuilder->new;
$builder->build( { source => 'Aqorder', value => { discount => 100 } } )->{discount};
To make sure this patch fixes the issue you can use this script:
use Modern::Perl;
use t::lib::TestBuilder;
my $builder = t::lib::TestBuilder->new;
my ( $real, $i ) = ( 0, 0 );
while ( $real < 100 ) {
$real = $builder->_gen_real( { info => { size => [ 6, 4 ] } } );
warn $i++;
}
warn "$i - $real";
Test plan:
0/ Does not apply this patch
1/ Run the snippet above
2/ Confirm that it fails quite quickly (constantly before 500 for me)
3/ Apply this patch
4/ Run again the script
5/ Confirm that it is stuck in an infinite loop
6/ CTRL-C :D
QA Note:
Other _gen_* subroutine may need a fix, but we will wait for them to fail
TODO:
1. Add JS check to the interface to prevent the use to enter a value > 100
2. Allow '100' as a valid value for discount (?)
Followed test plan, patch worked as described
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5e2b67d8c5982029c427c75930bfec6a4395dd9f)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b5148f412b741d1342c564360c690f14c9be6b94
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 16 14:52:25 2018 -0300
Bug 21556: Do not crash if a biblio is deleted twice
To recreate:
- Go to a bibliographic detail page
- Delete it
- Go back
- Delete it again
=> Without this patch you will get a 500
Can't call method "holds" on an undefined value at
/home/vagrant/kohaclone/C4/Biblio.pm line 406.
=> With this patch applied it will silently redirect you to the search
form.
Note: We could/should improve the behavior and display a message, but
DelBiblio will need to be moved to Koha::Biblio->delete and other
callers adjusted
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 515ed462cff54afd0725471c977d437fbeb54aa4)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4f239147fc240d1f8caa49d3722b712758b9ed77
Author: David Cook <dcook at prosentient.com.au>
Date: Fri Oct 12 01:53:22 2018 +0000
Bug 21556: Deleting same record twice leads to fatal software error
If you delete a record, confirm the deletion, and try to delete the
record and confirm it again befoe the first deletion completes, you'll
generate a fatal software error.
This patch unbinds the click handlers for the "Delete record" button
after the deletion is confirmed and just before the Javascript
processes the redirect to the next page in the process.
To test:
1) You will need a bibliographic record that is able to be deleted
2) Click "Edit", then "Delete record", then "OK"
3) While the browser is reloading, click "Edit", then "Delete record",
then "OK
4) Observe a fatal error such as "Internal server error" or 'Can't call
method "holds" on an undefined value at
/home/vagrant/kohaclone/C4/Biblio.pm line 406.'
5) Apply the patch
6) Run "restart_all" on kohadevbox (or otherwise restart Plack if
running Plack)
7) Navigate to another bibliographic record that is able to be deleted
8) Click "Edit", then "Delete record", then "OK"
9) While the browser is reloading, click "Edit", then "Delete record"
10) Observe that no fatal software error is generated
11) You are redirected to
http://localhost:8081/cgi-bin/koha/catalogue/search.pl (on kohadevbox)
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.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 9d78af26d96dd356a1ca05199c0fec20cd5077e1)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 45539696c16669dbc26810e403fccba48c2129f1
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 30 11:59:26 2018 +0000
Bug 21725: Use full statement in HAVING rather than constructed column
To test:
1 - prove -v t/db_dpendent/Acquisition/GetBasketsInfosByBookseller.t
2 - Apply patch
3 - prove -v t/db_dpendent/Acquisition/GetBasketsInfosByBookseller.t
4 - It passes
5 - Have some open/closed and some fully and not full received baskets
6 - View a vendor and confirm baskets are shwn as expected
7 - Check 'Show all baskets' shows all baskets
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Note sure this is the best thing but it fixes the issue
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit b5c456479da6a1033f9a697ca1bcf4295920aeb1)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 18bb4d5e66f4bfc74144bce2f730359b55526b08
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 23 12:30:25 2018 +0000
Bug 21476: Fix HTML5 media from playing in the OPAC - incorrect filters
This patch makes a correction to a template filter to prevent
incorrectly-encoded HTML in media source links which were preventing
media from embedding correctly in the OPAC.
To test, apply the patch and enable the HTML5MediaEnabled and
HTML5MediaYouTube system preferences.
- Edit a record to include links to videos in 856$u. For example:
- https://www.youtube.com/watch?v=grTwH6Evdfc
- https://archive.org/download/POPEYEMeetsSindbadTheSailor1936/POPEYE%20meets%20Sindbad%20The%20Sailor%20%281936%29.ogv
View the record in the OPAC and confirm that the videos display in
the
"Play media" tab and that they play correctly.
Tested and works as described, also matches the intranet code.
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
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 7736b5c2e32975502fa6198b5f7ec64feb7b8ffc)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ec7e569d55575f26ba481684ff157c8ec3985002
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 31 12:18:58 2018 +0000
Bug 21742: Fix YouTube variable propagation
The loop to find all media has an $isyoutube variable. This was declared
outside the loop and never reset. Once a YouTube video was encountered
all subsequent videos were considered as YouTube. This patch reduces the
scope of the variable and resets per loop.
To test:
1 - Enable HTML5Media and HTML5MediaYouTube
2 - Add 856$u to record for a youtube vido and a pdf (sample record
attached to bug)
3 - View the record, the Play media tab has two video boxes
4 - Play the second, it fails
5 - Apply patch
6 - View record, Play media should include only one video link
Signed-off-by: Devinim <kohadevinim at devinim.com.tr>
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 8ceba54c8dcfd9b598375b8af432c0111ec63d04)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 776423df10e6237be78420ef63e1a53694cb884d
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Oct 29 19:59:00 2018 +0000
Bug 21698: (QA follow-up) Fix typo verbosev -> verbose
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 04114d4b835c10bb03b9c092268fc632d5552fed)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 77969527962b4f8c098b59f50989bbea26831803
Author: Magnus Enger <magnus at libriotech.no>
Date: Fri Oct 26 22:47:16 2018 +0200
Bug 21698: Fix POD of cancel_unfilled_holds.pl
To test:
- Run "perldoc misc/cronjobs/holds/cancel_unfilled_holds.pl"
- Notice some problems:
-- No description in the NAME section
-- Descriptions of options in the SYNOPSIS section
-- A literal head1
-- Long options are listed with a single leading dash
-- Options --verbose and --confirm are not listed under OPTIONS)
- Take a look at the script itself to see that --verbose and
--confirm should be listed.
- Also note the typo on line 97: 'v|verbosev' => \$verbose,
- Apply the patch
- Look at the script and perldoc again and check that all problems
described above are now fixed.
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit b7b6727f92615bcebf2f037202e6647a34c7705a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1ee7a438b2dc18e2a202795bb4203b58a0c36674
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Jun 5 11:55:12 2017 +0200
Bug 18720: Use exception instead of die in GetBasketAsCsv
Test plan:
prove t/db_dependent/Acquisition/GetBasketAsCSV.t
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 77ea4686395f88c9678c611a78e6db4fd4c04101)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 11 ++++--
C4/Biblio.pm | 5 ++-
C4/Budgets.pm | 5 +++
C4/HTML5Media.pm | 2 +-
.../prog/en/modules/ill/ill-requests.tt | 11 +++---
koha-tmpl/intranet-tmpl/prog/js/catalog.js | 1 +
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 8 ++---
misc/cronjobs/holds/cancel_unfilled_holds.pl | 38 ++++++++++----------
t/db_dependent/Acquisition/GetBasketAsCSV.t | 14 ++++++--
t/db_dependent/Biblio.t | 13 ++++++-
t/db_dependent/Budgets.t | 2 ++
t/lib/TestBuilder.pm | 2 +-
12 files changed, 75 insertions(+), 37 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list