[koha-commits] main Koha release repository branch master updated. v18.11.00-1433-g604c7b8
Git repo owner
gitmaster at git.koha-community.org
Tue May 7 14:01:58 CEST 2019
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 604c7b818b63b93c66bb751ceb9d99bc1c109be9 (commit)
via 88b37330abaee6372ec999c1a81fd216d66a1379 (commit)
via 295e9b1054386cf188c5fc1eb4fd590e5c451513 (commit)
via 4560d9623663e9fd0b60f9a39ec53082cdd90f24 (commit)
via b9bff787ca863a45128cbd3a05a109e8f66d4fdf (commit)
via 100b1e3eecb4de27f6a85095196019f6b36251c0 (commit)
via abd4445cd2b86fe601de20b403bb621115b27c83 (commit)
via d57239ca78e7719f4c04865e8c493919c6362c15 (commit)
via 914f23970de536df3972ebd75b280ee8eec98955 (commit)
via 45b1ff8dfa1054590544caff200b307144bd02cf (commit)
via 10efe4e3f239c47b847c53f06f82245e07d54759 (commit)
via c1513a10c35f721e3c519d5ab3c38c7154b7fa1c (commit)
via 6509d73d7925fe5d317d6f2baa1d1565d8d36220 (commit)
via 28bcc5aa68733e41d50a6a801088b06857968f42 (commit)
from 6a0246e24838cfba672baf4aef080588b7d091bf (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 604c7b818b63b93c66bb751ceb9d99bc1c109be9
Author: Liz Rea <wizzyrea at gmail.com>
Date: Wed May 1 00:31:15 2019 +0000
Bug 22816: OPAC detail holdings table should now look a bit better
This patch sets the "autowidth" option to "false" for the OPAC
holdings DataTable on opac-detail.pl. This gives the table a fluid
width rather than having the width be "hard-coded" by DataTables upon
first page render.
To test, apply the patch and view the detail page for a bibliographic
record with some items. Under the "Holdings" tab, the table of
holdings should fill the width of the tab container.
Resize the browser window and confirm that the table width adjusts
accordingly.
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: arthur <arthur.bousquet at inlibro.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 88b37330abaee6372ec999c1a81fd216d66a1379
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jul 5 12:10:26 2018 +0200
Bug 21036: Remove odd number of elements warnings from AuthoritiesMarc.pm
Like this one (16.11 line number):
Odd number of elements in anonymous hash at C4/AuthoritiesMarc.pm line 1070.
We need to add a scalar to some MARC::Field::subfield calls. In list context
an empty list returned affects the hash built around it.
Test plan:
Could reproduce this warning easily from OPAC authority search.
opac-authorities-home.pl calling BuildSummary.
Signed-off-by: Bouzid Fergani <bouzid.fergani at inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 295e9b1054386cf188c5fc1eb4fd590e5c451513
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jul 5 09:53:57 2018 +0200
Bug 21036: Fix warnings from C4/Biblio
Use of uninitialized value $isbn in string ne at /usr/share/koha/prodclone/C4/Biblio.pm line 1794. (16.11 line number)
Trivial edit.
And these warnings from TransformHtmlToXml (with 16.11 line numbers):
Use of uninitialized value in substr at /usr/share/koha/prodclone/C4/Biblio.pm line 2527.
Use of uninitialized value in substr at /usr/share/koha/prodclone/C4/Biblio.pm line 2528.
substr outside of string at /usr/share/koha/prodclone/C4/Biblio.pm line 2528.
Indicator in 952 is empty at /usr/share/koha/prodclone/C4/Biblio.pm line 2534.
The last warning is not needed and can be removed.
Note that the code used the construct @$indicator[$j] for $$indicator[$j].
The first is an array slice. This worked in list context. But apparently
the second was meant to be used. And can be rewritten as $indicator->[$j]
which generally is considered more readable.
The code around indicator1/2 and ind1/2 is simplified. This change is applied
twice in the same sub.
Test plan:
Read the changes.
Run t/Biblio/TransformHtmlToXml.t
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4560d9623663e9fd0b60f9a39ec53082cdd90f24
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 4 16:49:38 2018 +0200
Bug 21036: Fix uninitialized value within @itemnumber in string ne
Line from 16.11 log:
Use of uninitialized value within @itemnumber in string ne at /usr/share/koha/prodclone/reserve/modrequest.pl line 70.
Test plan:
Read the change. Not 100% identical (numeric zero) but should be enough.
This line is probably not needed at all.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b9bff787ca863a45128cbd3a05a109e8f66d4fdf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Apr 28 22:09:39 2019 -0400
Bug 22800: (bug 22550 follow-up) Do not raw filter when not necessary (OPAC suggestions)
This is a follow-up for bug 22550, we do not need to use the $raw
filter.
Test plan:
Same as bug 22550:
Test plan:
Test plan:
1. OPAC->login->your purchase suggestions->New purchase suggestion
2. Click button "Submit your suggestion" directly without filling in any field.
Empty suggestion record was added succeffully.
3. Apply the patch.
4. Click button "Submit your suggestion" directly without filling in any field.
The required fields should be labeled in red.
(you can change the mandatory fields by preference
'OPACSuggestionMandatoryFields')
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 100b1e3eecb4de27f6a85095196019f6b36251c0
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 26 19:58:05 2019 +0000
Bug 22791: Unify calculation between aqui-home and ordered.pl
To test:
1 - Enable order price rounding
2 - Order an example with 8 * 16,99 and 42% discount, 19.45% tax.
3 - Check ordered page - 94.17 is total
4 - Check aqui-home - 94.16 is total
5 - Apply patch
6 - Verify numbers now match
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit abd4445cd2b86fe601de20b403bb621115b27c83
Author: Liz Rea <wizzyrea at gmail.com>
Date: Tue Apr 16 06:55:36 2019 +0000
Bug 22527: web installer links to outdated DB manual
To reproduce:
1. Use MySQL or MariaDB for your Koha installation
2. Create an empty database and point $KOHA_CONF to this database name.
3. Grant SELECT privilege to your database user, e.g.
grant select on koha3.* to 'koha'@'%' identified by 'koha';
4. Go to step 2 of web installer where it checks database
connection
5. Observe the following message
User koha doesn't have enough privilege on database koha.
Ask for or make a change in the user's privileges. User koha must
have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on
database koha2.
Need help? See manual for PostgreSQL
6. Note "See manual for PostgreSQL" is wrong. Should now read Need help?
For help with granting permissions, please search online for "[%
dbms %] manual grant permissions" of course the dbms should be the dbms
you are using.
7. Apply patch, restart all
8. Refresh page and observe it now displays correct link
Test plan and original patchset by Lari Taskula <lari.taskula at hypernova.fi>
Sponsored-by: Hypernova Oy
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Bug 22527: Remove extra space after '?'
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d57239ca78e7719f4c04865e8c493919c6362c15
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Apr 29 14:18:43 2019 +0200
Bug 22787: Add mapping of letters "ů" and "Ů" to zebra definitions
Test plan:
0) Do not apply the patch
1) Add some word with character "ů" into metadata, for example author "Martinů, Bohuslav"
2) Try to search it with "Martinu" and you'll see you can't find it
3) Apply the patch
4) Copy file etc/zebradb/etc/word-phrase-utf.chr to your /etc/koha directory
sudo cp etc/zebradb/etc/word-phrase-utf.chr /etc/koha/zebradb/etc/
5) koha-zebra --restart kohadev
6) koha-rebuild-zebra -f kohadev
6) try to search "Martinu" again - you should be able to find your record
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 914f23970de536df3972ebd75b280ee8eec98955
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 12 15:20:33 2018 -0300
Bug 21671: Prevent Modifications.t to fail randomly
If repeatable is set to 0 by TestBuilder, the tests will fail with:
t/db_dependent/Koha/Patron/Modifications.t .. 1/6 # Looks like you planned 20 tests but ran 9.
# Failed test 'approve tests'
# at t/db_dependent/Koha/Patron/Modifications.t line 259.
[repeatable not set for attribute type and tried to add a new attribute for the same code]# Looks like your test exited with 255 just after 5.
Signed-off-by: Liz Rea <wizzyrea 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 45b1ff8dfa1054590544caff200b307144bd02cf
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Apr 30 15:48:14 2019 -0300
Bug 22813: (follow-up) Add missing condition
This patch restores a missing condition. $patron gets renamed to make
it obvious that it related to the logged in user.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 10efe4e3f239c47b847c53f06f82245e07d54759
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Apr 30 12:30:25 2019 -0300
Bug 22813: remove repetitive queries inside two nested loops in searchResults
This patch moves a query on Koha::Patrons and then the related
Koha::Patron::Category that needlessly happens inside two nested loops
(all items of all MARC records in the resultset).
The Koha::Patron and Koha::Patron::Category are always the same as it is
fetched from C4::Context->userenv each time.
To test:
- Run:
$ kshell
k$ prove t/db_dependent/Search.t
=> SUCCESS: Tests pass
- Apply this patch
- Run:
k$ prove t/db_dependent/Search.t
=> SUCCESS: Tests still pass!
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c1513a10c35f721e3c519d5ab3c38c7154b7fa1c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 4 18:12:56 2019 -0300
Bug 22453: Make TestBuilder generates dates taking into account the timezone
I have no idea why this only appears today but TestBuilder generates dates using DateTime->now,
which does not take into account the timezone.
It has been highlights by a failing test today on U18.
Why today whereas this patch was pushed few weeks ago?
Why U18 and not D9?
The output of the test is:
koha_1 | # Failed test 'With BorrowerLogs and TrackLastPatronActivity we should not spam the logs'
koha_1 | # at t/db_dependent/Koha/Patrons.t line 1421.
koha_1 | # got: '2'
koha_1 | # expected: '1'
koha_1 | # Looks like you failed 1 test of 4.
koha_1 |
koha_1 | # Failed test 'BorrowersLog tests'
koha_1 | # at t/db_dependent/Koha/Patrons.t line 1422.
koha_1 | # Looks like you failed 1 test of 33.
koha_1 | [19:51:44] t/db_dependent/Koha/Patrons.t
Actually there are 2 logs, one for the cardnumber that is expected, and on for updated_on:
"updated_on" : {
"after" : "2019-03-04 21:10:00",
"before" : "2019-03-04 18:10:00"
}
Apart from the fact that we may want to remove this updated_on field from MODIFY,
the before/after dates differ from 3 hours.
Here it's currently 18:10 and in UTC-3
To prevent such behaviors in tests (create stuffs in the future...), we should
use our Koha::DateUtils::dt_from_string method that takes care of the timezone
used in other places of Koha.
Test plan:
prove t/db_dependent/Koha/Patrons.t
May fail without this patch.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
This patch is fine in itself, but there may still be an issue around
the failing test for TrackLastPatronActivity. Reopened bug 22741.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6509d73d7925fe5d317d6f2baa1d1565d8d36220
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Tue Apr 30 10:56:20 2019 +0200
Bug 22808: Move Cache.t to db_dependent
Cache.t fails during package build. Moving it to db_dependent fixes
the problem.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 28bcc5aa68733e41d50a6a801088b06857968f42
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Feb 27 07:09:12 2019 -0300
Bug 22420: Remove wrong calculation on approved tags
Before the patch from bug 14385, the passed structure (that is returned
by get_approval_rows() looks like:
\ [
[0] {
approved 1,
approved_by 51,
approved_by_name undef,
date_approved "2019-02-26 15:36:42",
term "another",
weight_total 3
},
[1] {
...
After the introduced 'filtering', we loose the information about the
term weight!:
\ [
[0] {
approved 1,
author "Heylin, Clinton.",
biblionumber 1,
borrowernumber 51,
date_created "2019-02-26 15:36:37",
language undef,
subtitle [],
tag_id 1,
term "word",
time_created_display "15:36:37",
title "E Street shuffle :",
visible 1,
XSLTBloc "
<<<BUNCH OF GENERATED HTML HERE>>>
...
The code even calls GetMarcBiblio. This needs to be reverted as it is
plain wrong. If it was worth removing *some* biblios from the
weight_total value, then this calculation should be done somewhere else,
without fetching the MARC data again.
Signed-off-by: Claudio <costalc at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/AuthoritiesMarc.pm | 10 +++----
C4/Biblio.pm | 28 +++++---------------
C4/Search.pm | 13 ++++++---
acqui/ordered.pl | 2 +-
etc/zebradb/etc/word-phrase-utf.chr | 2 ++
.../prog/en/modules/installer/step2.tt | 6 +----
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +++--
.../bootstrap/en/modules/opac-suggestions.tt | 4 +--
opac/opac-suggestions.pl | 6 ++---
opac/opac-tags.pl | 18 -------------
reserve/modrequest.pl | 2 +-
t/{ => db_dependent}/Cache.t | 0
t/db_dependent/Koha/Patron/Modifications.t | 2 +-
t/lib/TestBuilder.pm | 5 ++--
14 files changed, 39 insertions(+), 65 deletions(-)
rename t/{ => db_dependent}/Cache.t (100%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list