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 981b601c39e97e23d309fe342c00a819a9ee8ad6 (commit)
via 40ab030060d6cbacb0be9df981fb28a6ade705ea (commit)
via 96a871035043c7ffd93c61e756ee1ff89e3da0f0 (commit)
via 92970a9abad312a07d9efba46cc57b27469a0509 (commit)
via afd88e1d21a5cb5f2198c058144065b64098c124 (commit)
via 25127f422821756b030b8f377b3e112b907be5eb (commit)
via 95c8d19530e8bef20e02be0b74d7927764bf7ed1 (commit)
via 4ed4e468d2ceaf4502b817feb791656d5a159fa5 (commit)
via 082da615e649146197fbc9e0a20da672a82d4816 (commit)
from 4b0c2e56e43ddacbd3983a8669026b95cd08d660 (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 981b601c39e97e23d309fe342c00a819a9ee8ad6
Author: Owen Leonard <[email protected]>
Date: Thu Jul 2 12:50:17 2020 +0000
Bug 25909: Recent change to datatables JS in the OPAC causes errors
This patch reverts some changes made by Bug 25287 which prematurely
introduced the double-underscore i18n function. The i18n features
haven't been fully implemented in the OPAC.
Some lines are reverts to the previous version, and some are additions,
for instance where Bug 25287 introduced new DataTables features and a
new string translation is required.
In addition to i18n changes, the patch also reverts the default
configuration of DataTables in the OPAC so that the "dom" configuration
option is set back to "t." This turns off features like pagination
buttons, filters, etc. which were previously disabled by default.
Enabling these features requires revision to the OPAC CSS in order for
them to display well.
To test, apply the patch and view a page in the OPAC which includes a
DataTable. For instance: checkouts on the "your summary" page, serial
issues on the "full subscription history" page.
Tables should display correctly and sorting should work correctly. There
should be no other DataTables controls visible.
To test translatability:
To test, apply the patch and test that the correct strings are
translatable. In this example I'm testing fr-FR:
- Update a translation:
> cd misc/translator
> perl translate update fr-FR
- Open the corresponding .po file for the strings pulled from
the templates e.g. misc/translator/po/fr-FR-opac-bootstrap.po
- Locate strings pulled from bootstrap/en/includes/datatables.inc
for translation, e.g.:
#. SCRIPT
#: opac-tmpl/bootstrap/en/includes/datatables.inc:4
msgid "Copy to clipboard"
msgstr ""
- Edit the "msgstr" string however you want (it's just for testing)
- Install the updated translation:
> perl translate install fr-FR
Open the translated copy of datatables.inc and confirm that the
translated string appears.
Signed-off-by: Tomas Cohen Arazi <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
commit 40ab030060d6cbacb0be9df981fb28a6ade705ea
Author: Martin Renvoize <[email protected]>
Date: Tue Jul 7 09:27:48 2020 +0100
Bug 25944: Schema fix for illrequests route
The illrequests path was missing the `comments` and `status_alias`
embedable relations in the path specification.
Test plan:
1/ Ensure you have the latest Mojolicious + OpenAPI modules installed.
2/ Navigate to the ill requests page and note that the table is empty.
3/ Note that under the networking tab in your browsers developer tools
that the api call fails with a 400 error.
4/ Apply the patch
5/ Refresh the page
6/ The table should now load and the api route should return a proper
200 response.
7/ Signoff
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Magnus Enger <[email protected]>
Applied the patch to a production server that was having the 400
error on the main ILL page, and the error was gone.
Signed-off-by: Tomas Cohen Arazi <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
commit 96a871035043c7ffd93c61e756ee1ff89e3da0f0
Author: Nick Clemens <[email protected]>
Date: Thu May 21 13:41:23 2020 +0000
Bug 25566: Add option to ignore found holds and use it when checking high
holds
To test:
1 - Find or create a record with 10 items
2 - Set sysprefs:
decreaseLoanHighHolds - enable
decreaseLoanHighHoldsDuration - 2
decreaseLoanHighHoldsValue - 2
decreaseLoanHighHoldsControl - 'over the number of holdable
items'/dynamic
3 - Set circ rules to allow 1 hold per record on the relevant record
4 - Place 3 holds on the record
5 - Check one item in and confirm hold to set to waiting
6 - Issue to the patron with the waiting hold
7 - Get a notice that loan period is decreased
8 - Don't confirm the checkout
9 - Apply patch
10 - Restart all the things
11 - Repeat checkout, no decrease this time!
Signed-off-by: Christopher Brannon <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
commit 92970a9abad312a07d9efba46cc57b27469a0509
Author: Nick Clemens <[email protected]>
Date: Tue Jul 7 12:05:42 2020 +0000
Bug 25850: (QA follow-up) use dt_from_string
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
commit afd88e1d21a5cb5f2198c058144065b64098c124
Author: Martin Renvoize <[email protected]>
Date: Mon Jun 29 09:54:58 2020 +0100
Bug 25850: (QA follow-up) Match logic in is_holiday
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
commit 25127f422821756b030b8f377b3e112b907be5eb
Author: Andreas Jonsson <[email protected]>
Date: Tue Jun 23 15:57:29 2020 +0200
Bug 25850: Adapt day of week in Koha::Calendar::get_push_amt to 0..6 with 0
being Sunday.
1. Go to tools -> calendar and make sure Sundays are holidays by adding
a holiday on a Sunday and selecting "Holiday repeated every same day
of the week" and "Copy to all libraries" and save.
2. Go to administration -> system preferences and select "Use the
calendar to push the due date to the next open matching weekday
for weekly loan periods, or the next open day otherwise" for the
system preference "useDaysMode" and save the system preferences.
3. Put the below code in a file name test.pl and execute it using
the command "sudo koha-shell -c 'perl test.pl' kohadev"
use Koha::Calendar;
my $calendar = Koha::Calendar->new( branchcode => 'CPL' );
$dt = DateTime->new(
year => 2020,
month => 06,
day => 21
);
print "This is a sunday: " .
$dt->day_of_week . "\n";
my $ndt = $calendar->next_open_days($dt, 0);
print "This is a monday: " .
$ndt->day_of_week . "\n";
4. Without the patch applied, this script
will freeze after printing "This is a
sunday ...". Abort using ctrl-c.
5. Apply patch and run the script again.
The test script will now complete.
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
commit 95c8d19530e8bef20e02be0b74d7927764bf7ed1
Author: Martin Renvoize <[email protected]>
Date: Fri Jun 26 16:52:50 2020 +0100
Bug 25850: Regression Test
This patch adds a unit test to test for an infinite loop as highlighted
by the bug.
Test plan
1/ Run the test before applying the fix
2/ The test should fail for 'Sundays'
3/ Apply the subsquent patch
4/ Re-run the test
5/ It should now pass
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
commit 4ed4e468d2ceaf4502b817feb791656d5a159fa5
Author: Martin Renvoize <[email protected]>
Date: Fri Jun 26 16:24:00 2020 +0100
Bug 25850: Add tests for weekday holidays
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
commit 082da615e649146197fbc9e0a20da672a82d4816
Author: Joonas Kylmälä <[email protected]>
Date: Wed Jul 15 11:08:32 2020 +0000
Bug 25992: Make SIP2 logger subroutines exportable to prevent crash
If the subroutines are not exportable we get the following crash:
> Undefined subroutine &C4::SIP::SIPServer::set_logger
To test:
In kohadevbox run for example:
$ ps -aux # check that no existing sip server is running, kill the process
if exists
$ perl /kohadevbox/koha/C4/SIP/SIPServer.pm
/etc/koha/sites/kohadev/SIPconfig.xml
$ koha/misc/sip_cli_emulator.pl -su koha -sp koha -l CPL -a 127.0.0.1 -p
6001 --item 3999900000001 -m item_information
After applying this patch the Undefined subroutine error should be gone.
Note: when using the sip_cli_emulator.pl the credentials can be anything.
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Tomas Cohen Arazi <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 2 +-
C4/Reserves.pm | 29 +++---
C4/SIP/Logger.pm | 3 +
Koha/Calendar.pm | 9 +-
api/v1/swagger/paths/illrequests.json | 4 +-
.../opac-tmpl/bootstrap/en/includes/datatables.inc | 8 +-
koha-tmpl/opac-tmpl/bootstrap/js/datatables.js | 48 +++++-----
t/db_dependent/Calendar.t | 101 ++++++++++++++++++++-
t/db_dependent/DecreaseLoanHighHolds.t | 26 +++++-
t/db_dependent/Reserves/MultiplePerRecord.t | 7 +-
10 files changed, 190 insertions(+), 47 deletions(-)
hooks/post-receive
--
main Koha release repository
_______________________________________________
koha-commits mailing list
[email protected]
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits
