[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.02-37-g8c72eaa
Git repo owner
gitmaster at git.koha-community.org
Thu Jul 25 14:22:53 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, 19.05.x has been updated
via 8c72eaaf86ee0d4d43e8d12b0f7b98992cd4d7a1 (commit)
via cfecb07aeb93b1d6007240ede69132b4047ffcf8 (commit)
via 6490ffb606efbfcf9af5f1f68638c9804f8059b9 (commit)
via 566158e9fc54c1f133eed8c703af7143fdccdcd1 (commit)
via 25caca7d5308b0650c6df7672b210552c342af24 (commit)
via d89d8a47fd2f3b30c9d74d7adae6e54830187045 (commit)
via a7784942bf243d4918d3ec230f35bde02b554902 (commit)
via bac77d76d53c8d39e7df9c9e12a090f5a97cf4ca (commit)
via efab6445010254973468314c90b544e4f5318684 (commit)
via 0dd58132e64be0d146d1809967a41730965c5d62 (commit)
via a38bc661008aecfcc1d2a3f92eb242dd4eabcc96 (commit)
via 4c3d5e8ccfd743be4baa6eeaca5ce3a919d306e6 (commit)
via d4b8b10d4125788c75b1995f22f055a62fc47979 (commit)
via 34e13040b2f8616c74aa542813d40b11f68ec4be (commit)
via 570c0405b4074555df0fc129ec860991e9680bac (commit)
via 85ff5a7a7dd15ddda8e96298405570b1bab2cb31 (commit)
via 14d13d9b5dab629f8f5be6b5ad8e53ba14688ff7 (commit)
via 4e31d54c9b910f2019c4ec4100f6c3a0c3c83aeb (commit)
via 0bf47532e64fc5493d07958355927720dd5f8ca7 (commit)
via 79736abef5b59722055f4ea3b95d4bb250c38895 (commit)
via 5126306dda991270fe975253c04a599211af8898 (commit)
via 7a89deb63a7e45c1fd5a41a82ce975ab57003cb9 (commit)
via f0cdc306cd45c4f897202fb6ddb009f45111dbf1 (commit)
from 311019c7a190916c9a9f312859493c088cf01328 (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 8c72eaaf86ee0d4d43e8d12b0f7b98992cd4d7a1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 28 14:01:04 2019 -0500
Bug 23225: Do not hide a biblio if there is no item
This patch fixes a 404 redirect from the OPAC ISBD view if the
bibliographic record does not have item attached.
Signed-off-by: Luis F. Lopez <lflfalagan at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit f317d384f657bb8341a1a641343e18ed9598240d)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit cfecb07aeb93b1d6007240ede69132b4047ffcf8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 28 14:00:53 2019 -0500
Bug 23225: Add a test
Signed-off-by: Luis F. Lopez <lflfalagan at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit f5d3dec2e4ddfa20006cd9f81e28616b36230685)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 6490ffb606efbfcf9af5f1f68638c9804f8059b9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jun 24 17:16:07 2019 +0000
Bug 23196: (follow-up) Add comments to highlight structure
This follow-up adds a few comments to the markup in order to highlight
and clarify the the HTML structure.
To test, apply the patch and perform a diff against master using the
'-w' flag:
git diff -w origin/master
You should only see the addition of HTML comments.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit fc39e24eb502c1f724e8c5aa8b7264db901be278)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 566158e9fc54c1f133eed8c703af7143fdccdcd1
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jun 24 17:09:36 2019 +0000
Bug 23196: Reindent tools/batch_record_modification.tt
This patch re-indents the template for batch record modifications. It
makes only whitespace changes. It should have no effect on the behavior
of the page.
To test, apply the patch and perform a diff against master using the
'-w' flag:
git diff -w origin/master
There should be no changes reported.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 1693c2e01d6eb001a35caf3bb31b9d057c2136fe)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 25caca7d5308b0650c6df7672b210552c342af24
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jun 21 14:07:49 2019 +0000
Bug 23183: Reindent cataloging.js
This patch makes some very minor corrections to indentation in
cataloging.js, a JavaScript file used by the bibliographic and item
records editors.
To test, apply the patch and perform a diff against master using the
'-w' flag:
git diff -w origin/master
There should be no changes reported.
Signed-off-by: Nadine Pierre <nadine.pierre at inLibro.com>
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit f50afc1fc0b9044c21564b45f44687993ebc07e3)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d89d8a47fd2f3b30c9d74d7adae6e54830187045
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jun 24 10:28:00 2019 -0300
Bug 23193: Make set_password.pl use Koha::Script
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit d5fd85da18e7e3c548cc9d56689b09fd34615aed)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit a7784942bf243d4918d3ec230f35bde02b554902
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jun 28 14:31:03 2019 +0100
Bug 22128: Add Rudolf Byker to contributors
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 18767d62a873570637d199586bbeca4200e67d1c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit bac77d76d53c8d39e7df9c9e12a090f5a97cf4ca
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Jun 11 13:39:48 2019 +0000
Bug 22128: Removed outdated comment
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 787b86f9d4d3aa83502f9b2afdc98d9ff6761b8e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit efab6445010254973468314c90b544e4f5318684
Author: Rudolf Byker <rudolfbyker at gmail.com>
Date: Fri May 24 13:25:45 2019 -0500
Bug 22128: Use DROP USER IF EXISTS instead of GRANT USAGE before DROP USAGE
MySQL 5.7 is old, and the latest versions fail on "GRANT USAGE" if the
user does not exist. "DROP USER IF EXISTS" has been with us since 5.7,
so all users should have it by now. This patch fixes the issue.
To test:
Try to koha_remove a site, and if it works with no errors, all good!
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit e9bb407f62a208d42aefb03d16decd87bae228e7)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 0dd58132e64be0d146d1809967a41730965c5d62
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jun 26 12:49:14 2019 +0000
Bug 23220: Prevent form submission before redirect
To test:
1 - Check in an item to generate a transfer (form another library, no floating)
2 - Check it in again, click 'Cancel transfer'
3 - It may or may not work
4 - To highlight the issue edit return.tt to add the delay line as below:
$('.cancel-transfer').on("click",function(e){
delay(5000);
window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber | html %]&canceltransfer=1'
});
5 - Check in the item repeatedly, click 'Cancel transfer'
6 - View the item in the staff or opac and verify it remains in transit
7 - Undo changes above, apply patch
8 - Test 'Cancel transfer', note it works
9 - Add the delay back in, confirm it still works
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 4dcf416dc9547fd28e6ed846d08d6bbecb144552)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit a38bc661008aecfcc1d2a3f92eb242dd4eabcc96
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jun 25 17:43:41 2019 -0500
Bug 23211: Prevent SIP/Transaction.t to fail randomly
The checkout failed because patron's category is the one used for statistics (category_type=X).
To recreate the failure:
modified: t/db_dependent/SIP/Transaction.t
@ Transaction.t:37 @ subtest fill_holds_at_checkout => sub {
plan tests => 6;
- my $category = $builder->build({ source => 'Category' });
+ my $category = $builder->build({ source => 'Category', value => { category_type => 'X' }});
my $branch = $builder->build({ source => 'Branch' });
my $borrower = $builder->build({ source => 'Borrower', value =>{
branchcode => $branch->{branchcode},
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 466f99e44230968aeb51598e50f65d212941c5b4)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4c3d5e8ccfd743be4baa6eeaca5ce3a919d306e6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jun 24 12:39:15 2019 -0500
Bug 23126: Add tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit e639400225e2d04823eee7a00e490d87f8d60401)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d4b8b10d4125788c75b1995f22f055a62fc47979
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Jun 21 01:25:02 2019 +0000
Bug 23126: Remove more unnecessary linebreak processing from serial collection
This should have no visible effect on the templates as the
information the grep changes is not used in the template.
It's also strange, that these lines existed, as
GetSubscriptionsFromBiblionumber contained the same changes.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Arthur Bousquet <arthur.bousquet at inlibro.com>
Signed-off-by: Nadine Pierre <nadine.pierre at inLibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 2455286da42b73fa3efc29ac1a51ca81a0017a8e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 34e13040b2f8616c74aa542813d40b11f68ec4be
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Jun 18 08:06:10 2019 +0200
Bug 23126: Display multi-line entries in subscrpitions correctly
There are several notes and other fields in a subscription that
can be entered as multi-line input with breaks. We should display
them as they were entered with keeping the line breaks intact.
To test:
- Add a subscription
- Add comments including line breaks in internal and OPAC note
- Check the manual history checkbox
- Go to the subscription detail page, tab 'Planning'
- Use the 'Edit history' link to edit the history
- Enter content with line breaks in all the input fields where
it's possible
- Go to the OPAC detail page for your subscription record
- Go to tab 'Subscriptions' > More details > Brief history
- Verify the line breaks show there as <br>
- Apply patch
- Relaod page, verify all information displays correctly now
- Go back to the detail page, subscription tab - verify same there
- Go back to the subscription detail page in staff
- Check editing the history works as expected
- Verify information on all tabs displays correctly
- Receive a serial issue - verify note on top displays right
- Go to the serial collection page of the subscription - same there
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Nadine Pierre <nadine.pierre at inLibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 316eda1036fd08f9c78578b27e85fd79c6895237)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 570c0405b4074555df0fc129ec860991e9680bac
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Jun 19 12:07:58 2019 +0200
Bug 23156: Add pagination to checkouts in ILS-DI GetPatronInfo service
When patrons have a lot of checkouts, GetPatronInfo can take a lot of
time. This patch introduces two new parameters to allow pagination of
this list of checkouts
Also, fix a warning in C4::ILSDI::Services::GetPatronInfo
Test plan:
1. Go to /cgi-bin/koha/ilsdi.pl?service=GetPatronInfo&patron_id=X&show_loans=1
where X is a borrowernumber of a patron who has several checkouts
Verify that all checkouts are listed
2. Add '&loans_per_page=1&loans_page=1' to the URL. Verify that you have
now only one checkout listed, and that there is a new element
<total_loans> which contain the total number of checkouts
3. Increase the page number in the URL until you have seen all checkouts
4. prove t/db_dependent/ILSDI_Services.t
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 2351693b61db83e0405157fd75951abee8df0116)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 85ff5a7a7dd15ddda8e96298405570b1bab2cb31
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jun 25 12:40:57 2019 +0000
Bug 22566: (QA follow-up) Fix pod complaint
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 35093039df3b42ae33c746385669ba13deb38c7d)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 14d13d9b5dab629f8f5be6b5ad8e53ba14688ff7
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jun 18 14:29:02 2019 +0100
Bug 22566: Add 'branch' key to GetPreparedLetter
The branch key was missing from the subsitution call to
GetPreparedLetter.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit b3795df8012545af4134d7402e9609e2d89f7be9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4e31d54c9b910f2019c4ec4100f6c3a0c3c83aeb
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jun 18 14:24:27 2019 +0100
Bug 22566: Clarify intent of reports and add warnings
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 4e4f0b637c66ca04a07473c347cc741d456c20c5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 0bf47532e64fc5493d07958355927720dd5f8ca7
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jun 18 13:38:43 2019 +0100
Bug 22566: Rename 'report_email' to 'report_by_branch'
To clarify the intention of this routine, lets rename it
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 7e226ba3c018a890c823f10365dbe2b3d1d22d23)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 79736abef5b59722055f4ea3b95d4bb250c38895
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jun 18 12:57:07 2019 +0100
Bug 22566: Accept 'all' in the branch params
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 2b392a6db231c8069d57be88ebf4f2960af199fa)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 5126306dda991270fe975253c04a599211af8898
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jun 7 12:50:32 2019 +0100
Bug 22566: Fix some more issues
1) Fix warning for undefined value in sprintf when no items have the
indemand flag set.
2) Corrections to report_full for bad ternary in string construction
3) Perldoc corrections
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 4f3413f0d2688017f6a35b43d0d1d4a9d7295c5a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 7a89deb63a7e45c1fd5a41a82ce975ab57003cb9
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Mar 22 13:23:35 2019 -0400
Bug 22566: Fix some problems
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit b62473d192abaf9371bffb0ec4d73267a0070447)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit f0cdc306cd45c4f897202fb6ddb009f45111dbf1
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue May 21 14:45:06 2019 +0000
Bug 22949: Markup error in OPAC course reserves template
This patch adds a missing "=" in opac-course-reserves.tt in order to
quiet errors returned by the HTML validator.
To reproduce the problem you should have one or more course reserves
available in the OPAC. Go to the course reserves page. Run the page
through the W3C validation service: https://validator.w3.org. Either by
pasting in the URL for the search results (if web accessible) or by
viewing source, copying, and pasting into "Validate by Direct Input."
This patch addresses these errors:
- 'Quote " in attribute name. Probable cause: Matching quote missing
somewhere earlier.'
- 'Attribute class"inst_surname" not allowed on element span at this
point.'
To test, apply the patch and try again to reproduce the validation
errors. Those errors should no longer be present. There should be no
visible change to the page.
Signed-off-by: Frederik Chenier <frederik at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 35fe9cf40bb1472799db0f7596d33f1bd184fb9b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/ILSDI/Services.pm | 17 +-
C4/Serials.pm | 3 -
Koha/Biblio.pm | 6 +-
Koha/StockRotationRotas.pm | 1 +
debian/scripts/koha-remove | 7 +-
docs/contributors.yaml | 3 +
docs/history.txt | 1 +
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 1 +
.../prog/en/modules/serials/serials-collection.tt | 2 +-
.../prog/en/modules/serials/serials-edit.tt | 2 +-
.../prog/en/modules/serials/subscription-detail.tt | 4 +-
.../en/modules/tools/batch_record_modification.tt | 650 ++++++++++----------
koha-tmpl/intranet-tmpl/prog/js/cataloging.js | 38 +-
.../bootstrap/en/modules/opac-course-reserves.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +-
.../bootstrap/en/modules/opac-serial-issues.tt | 4 +-
misc/admin/set_password.pl | 1 +
misc/cronjobs/stockrotation.pl | 76 ++-
opac/ilsdi.pl | 2 +-
opac/opac-serial-issues.pl | 6 -
serials/serials-collection.pl | 4 -
t/db_dependent/ILSDI_Services.t | 55 +-
t/db_dependent/Koha/Biblio.t | 5 +-
t/db_dependent/SIP/Transaction.t | 2 +-
t/db_dependent/Serials.t | 27 +-
25 files changed, 511 insertions(+), 410 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list