[koha-commits] main Koha release repository branch master updated. v20.05.00-1902-g1aeeaf4c2b
Git repo owner
gitmaster at git.koha-community.org
Fri Nov 20 08:50:56 CET 2020
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 1aeeaf4c2b6f4c8f79e2472b7c66a832d0daf802 (commit)
via 43b66ccfae07d8a72e7fe5433dafa69f4c870602 (commit)
via 59e4b03d73cb4a103acdf25f858af4efaf6c491f (commit)
via a25b651cf257f41fd0a8c601e70acad74b479724 (commit)
via dff16710ae53ebfab8596f27b35a7c8e35f81edf (commit)
via c056385669cefa02e2a94f96d8edea570f3c887e (commit)
via f3cacc62cda58798e8f2de6cfdd636772d2158f0 (commit)
via ba04deb9c36feedd1e0659d2d78b9327ce54ff4c (commit)
via b4ffaeaec1fdc9ee7c33ee419139def9d62c586e (commit)
via 9dcb51a8387f65fa2d9ff47afa9c7bb91be95e90 (commit)
from 9f8ae9498d45b248189c804a7c3626803abbacf3 (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 1aeeaf4c2b6f4c8f79e2472b7c66a832d0daf802
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 19 17:15:32 2020 +0100
Bug 22343: (follow-up) Correctly handle password on editing
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 43b66ccfae07d8a72e7fe5433dafa69f4c870602
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 19 17:25:14 2020 +0100
Bug 26938: Compiled CSS
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 59e4b03d73cb4a103acdf25f858af4efaf6c491f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Nov 17 12:11:21 2020 +0000
Bug 26984: (follow-up) Don't delete patrons and checkouts in Objects.t
Rather than counting all and assuriing we get 10, we can count all, add 10, and ensure the numbers still match
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a25b651cf257f41fd0a8c601e70acad74b479724
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 12 13:11:13 2020 +0100
Bug 26984: Make tests pass if AnonymousPatron is set
There is only 1 place where it can be tricky to not remove them as we
want exactly 10 patrons to be present in the DB
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit dff16710ae53ebfab8596f27b35a7c8e35f81edf
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Tue Nov 10 17:00:09 2020 +0100
Bug 26992: Fix serial issue and related items deletion on serial collection page
serial-collection.pl uses C4::Items::DelItemCheck() function which is obsolete.
Test plan:
1. Create a subscription with items created when receiving.
2. Receive several issues, and create corresponding items.
3. On Serial collection page (serial-collection.pl), select several issues.
4. Click on button Delete selected issues
5. A confirmation page is displayed. Enable "Delete associated items?".
Then click on "Yes, delete" button.
You get this error: Undefined subroutine &C4::Items::DelItemCheck
6. Apply the patch an repeat steps 3-5.
Check that issues and related items are deleted.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c056385669cefa02e2a94f96d8edea570f3c887e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 19 11:13:34 2020 +0100
Bug 26854: Remove log of STDERR
See discussion on comments 12-20
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f3cacc62cda58798e8f2de6cfdd636772d2158f0
Author: David Cook <dcook at prosentient.com.au>
Date: Thu Oct 29 04:24:31 2020 +0000
Bug 26854: Close STDERR when forking stage-marc-import.pl
We need to close STDERR when forking stage-marc-import.pl,
or else the CGI session with Apache httpd does not properly
finish. This leads to unexpected behaviour across different httpd
versions, operating systems, etc.
This patch closes the STDERR file handle when forking a child
process to do MARC imports, and it re-opens STDERR to a log file
in the logdir directory to catch any import errors.
Test plan:
1. Apply the patch
2. Go to http://localhost:8081/cgi-bin/koha/tools/stage-marc-import.pl
3. Upload a MARC file with a large number of records (e.g. 30,000 records)
4. Open F12 dev tools
5. Click on "Network" tab
6. Clear all existing network logs
7. Click "Stage for import"
8. After ~30 seconds, the request to stage-marc-import.pl should return a 200 code
9. Immediately, calls to background-job-progress.pl should start, and the "Job progress"
bar should update at a maximum rate of every .5 seconds
(or more realistically 1-2 seconds)
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ba04deb9c36feedd1e0659d2d78b9327ce54ff4c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 19 14:24:59 2020 +0100
Bug 26031: Remove the failing tests and the diag
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b4ffaeaec1fdc9ee7c33ee419139def9d62c586e
Author: Mason James <mtj at kohaaloha.com>
Date: Fri Nov 20 02:10:28 2020 +1300
Bug 26031: Remove 4 failing tests from t/db_dependent/www/search_utf8.t
to test...
1/ apply patch
2/ run test
3/ observe PASS
root at kohadevbox:/kohadevbox/koha# export KOHA_INTRANET_URL="http://kohadev-intra.myDNSname.org:8081"
root at kohadevbox:/kohadevbox/koha# export KOHA_OPAC_URL="http://kohadev.myDNSname.org:8080"
root at kohadevbox:/kohadevbox/koha# prove -v ./t/db_dependent/www/search_utf8.t
1..87
ok 1 - connect to intranet
ok 2 - login to staff interface
ok 3 - load main page
ok 4 - open tools module
ok 5 - go to stage MARC
ok 6 - uploaded file
ok 7 - upload succeeded
ok 8 - reopen stage MARC page
ok 9 - stage MARC
ok 10 - have job ID
ok 11 - job was completed
ok 12 - reopen stage MARC page at end of upload
ok 13 - stage MARC
ok 14 - view batch
ok 15 - imported records into catalog
ok 16 - got search on intranet
ok 17 - got search on intranet
ok 18 - Base is like "(?^u:search.pl\?advsearch=1&idx=kw&q=%CE%91%CE%B8%CE%AE%CE%BD%CE%B1)"
ok 19 - UTF-8 are multi-byte. Good
ok 20 - UTF-8 chars are correctly present. Good
ok 21 - got opac
ok 22 - got opac
ok 23 - Base is like "(?^u:opac-search.pl\?(idx=&)?q=%CE%91%CE%B8%CE%AE%CE%BD%CE%B1)"
ok 24 - Base does not contain an idx
ok 25 - UTF-8 are multi-byte. Good
ok 26 - UTF-8 chars are correctly present. Good
ok 27 - view and clean batch
ok 28 - biblio on intranet
ok 29 - biblio deleted
ok 30 - connect to intranet
ok 31 - login to staff interface
ok 32 - load main page
ok 33 - open tools module
ok 34 - go to stage MARC
ok 35 - uploaded file
ok 36 - upload succeeded
ok 37 - reopen stage MARC page
ok 38 - stage MARC
ok 39 - have job ID
ok 40 - job was completed
ok 41 - reopen stage MARC page at end of upload
ok 42 - stage MARC
ok 43 - view batch
ok 44 - imported records into catalog
ok 45 - got search on intranet
ok 46 - got search on intranet
ok 47 - Base is like "(?^u:search.pl\?advsearch=1&idx=kw&q=Ram%C3%B2n)"
ok 48 - UTF-8 are multi-byte. Good
ok 49 - UTF-8 chars are correctly present. Good
ok 50 - got opac
ok 51 - got opac
ok 52 - Base is like "(?^u:opac-search.pl\?(idx=&)?q=Ram%C3%B2n)"
ok 53 - Base does not contain an idx
ok 54 - UTF-8 are multi-byte. Good
ok 55 - UTF-8 chars are correctly present. Good
ok 56 - view and clean batch
ok 57 - biblio on intranet
ok 58 - biblio deleted
ok 59 - connect to intranet
ok 60 - login to staff interface
ok 61 - load main page
ok 62 - open tools module
ok 63 - go to stage MARC
ok 64 - uploaded file
ok 65 - upload succeeded
ok 66 - reopen stage MARC page
ok 67 - stage MARC
ok 68 - have job ID
ok 69 - job was completed
ok 70 - reopen stage MARC page at end of upload
ok 71 - stage MARC
ok 72 - view batch
ok 73 - imported records into catalog
ok 74 - got search on intranet
ok 75 - got search on intranet
ok 76 - Base is like "(?^u:search.pl\?advsearch=1&idx=kw&q=%F0%A0%BB%BAtomasito%F0%A0%BB%BA)"
ok 77 - UTF-8 are multi-byte. Good
ok 78 - UTF-8 chars are correctly present. Good
ok 79 - got opac
ok 80 - got opac
ok 81 - Base is like "(?^u:opac-search.pl\?(idx=&)?q=%F0%A0%BB%BAtomasito%F0%A0%BB%BA)"
ok 82 - Base does not contain an idx
ok 83 - UTF-8 are multi-byte. Good
ok 84 - UTF-8 chars are correctly present. Good
ok 85 - view and clean batch
ok 86 - biblio on intranet
ok 87 - biblio deleted
ok
All tests successful.
Files=1, Tests=87, 127 wallclock secs ( 0.06 usr 0.02 sys + 3.00 cusr 0.99 csys = 4.07 CPU)
Result: PASS
real 2m6.709s
user 0m3.124s
sys 0m1.032s
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9dcb51a8387f65fa2d9ff47afa9c7bb91be95e90
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Nov 19 13:58:07 2020 +0000
Bug 24083: (follow-up) Assign renewals remaining string to content
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
admin/smtp_servers.pl | 7 ++----
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 2 +-
serials/serials-collection.pl | 14 +++++++-----
t/db_dependent/Accounts.t | 26 ++++-------------------
t/db_dependent/Koha/Biblio.t | 20 ++++++++---------
t/db_dependent/Koha/Objects.t | 9 ++++----
t/db_dependent/Template/Plugin/Categories.t | 14 ++++--------
t/db_dependent/www/search_utf8.t | 13 +-----------
tools/stage-marc-import.pl | 6 +++---
10 files changed, 38 insertions(+), 75 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list