[koha-commits] main Koha release repository branch master updated. v20.05.00-615-gc3b43d3156
Git repo owner
gitmaster at git.koha-community.org
Thu Aug 13 10:47:46 CEST 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 c3b43d31565d464bae664a9167b374baf191c834 (commit)
via 504228950f6c2167856289d0a39de0a92fb8a97b (commit)
via 831296be7a1947fd8aeed64862dbad6358c9875f (commit)
via 103e182a50d56858bbbfb159b8eba4f7d21954d4 (commit)
via c0acc0f4b40254e445fde782f37ef31b39e44449 (commit)
via d573e4c40cec94eaf0aa175cc8da74c94cf6c9ce (commit)
via 2e818915bec60fd579ed17c45d19b1f32a18e743 (commit)
via 27fb149673bf30eea38f1888159c866960aa0b54 (commit)
via 38b05bcd2721d9e65d2b2f4a12a64b4fa7ead593 (commit)
via 13d9bdc74417f337106070f85332a7ef24331878 (commit)
via a923dccab30c2a87cd1f14b60280cf31f8c4f62e (commit)
via 77d97dc60ef6663937207af5c9e237ef70de4229 (commit)
via f32f92cb577e01d638b1adbc3f065b511eb77d4a (commit)
via 4c01343a360419752f6c5e198ee22e6857b5d670 (commit)
via 6d7e7fc066c93b3893527ec3de0e34b2fc4fe58f (commit)
via ed6a65c1ddacaa80fe825056cc77c3a3170af683 (commit)
via ca44a3f2ca82371bd6a2d731b7b4fd185d9fd93a (commit)
via be719f30e4142e92d23f3a0566eca93f75224fc3 (commit)
via f916269465df99818fb15c108820d3b666968d39 (commit)
via 8b106ed9c4b0588502c6dd485de2aec6a80b32c6 (commit)
via ba8eeca3865bfcd77717e7a225279d5fb77c9989 (commit)
via 0dd05fc90a735b9e22359fcb461bdc9291e7a85f (commit)
via 53bd7b4075bef3f9ddbf6aeec561d99579fdd6e7 (commit)
via c6f819840a891e493582026c307797ef7d31c5f0 (commit)
via f7fcd69a11d4914dc6f3212192d90a06ecab12c3 (commit)
via 1af5b8a7d72c8e49f857907c85809a38ee5b1a07 (commit)
via 3239993fb1f3eafb2eca4004d5bd9a74e9995c1e (commit)
via ee8fe4d35127904e59038b6a5dd77a8096d98624 (commit)
via ed3e4540d73c1c3009375ad339e09a2e676fa1bd (commit)
via f0dad7ba511c5e387277ea5cbd6056c66f9fe4b1 (commit)
via c6dfd6801f20b0faa5e2b6ea4f783a4e3233f2de (commit)
via a86a1a74b98ed92e27e9f16d4336555dd763bce4 (commit)
via ccc7b3c8947c190b511ce5535382e50793f24c26 (commit)
via 6655961517b36c16b92ca5880f4dcf260ce4052f (commit)
via b6f2c4ac2d714edc1e35e3eb7749f9bb512c1a62 (commit)
via 7ebc85da16f5cbc48bf4041ef8b0cc9b1d794f9f (commit)
via 453fd5ce9012e247d552e7f93c367e4810de0939 (commit)
via 4f3a0a4b89c78c9fff1673787893067f66970cf4 (commit)
via 0545feb876f3bc673ee7a5f4de2fc66644cb35c6 (commit)
via 0570d1fd24fff4e23adc2f0de4e4f9bdc0a98d8f (commit)
from 9b342c81a044baeb8220e8a80ad8349adf8ff5b0 (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 c3b43d31565d464bae664a9167b374baf191c834
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 13 08:00:23 2020 +0000
Bug 16371: DBRev 20.06.00.023
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 504228950f6c2167856289d0a39de0a92fb8a97b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 13 09:57:27 2020 +0200
Bug 16371: Fix inconsistencies with timestamp
The timestamp value needs to be updated for each quote returned by
get_daily_quote (even when there is a match)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 831296be7a1947fd8aeed64862dbad6358c9875f
Author: Emmi Takkinen <emmi.takkinen at outlook.com>
Date: Fri Jul 31 09:47:56 2020 +0300
Bug 16371: Combine get_daily_quote and get_daily_quote_for_interface
This patch combines get_daily_quote and get_daily_quote_for_interface
methods and moves them from Koha::Quote to Koha::Quotes. Also removes
some unused code and adjusts datetime parsing.
To test apply this patch and confirm 'QuoteOfTheDay' syspref still
works as expected (quote is shown in correct mainpage(s)).
Also prove t/db_dependent/Koha/Quotes.t
Sponsored-by: Koha-Suomi Oy
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 103e182a50d56858bbbfb159b8eba4f7d21954d4
Author: Emmi Takkinen <emmi.takkinen at outlook.com>
Date: Wed Aug 12 09:16:43 2020 +0300
Bug 16371: Remove GetDailyQuote tests from Koha.t
Tests in Koha.t failed due GetDailyQuote tests. This patch
removes these tests since we test quotes in Quotes.t instead.
To test prove t/db_dependent/Koha.t
Sponsored-by: Koha-Suomi Oy
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c0acc0f4b40254e445fde782f37ef31b39e44449
Author: Emmi Takkinen <emmi.takkinen at outlook.com>
Date: Tue Jul 7 15:45:17 2020 +0300
Bug 16371: Rewrite get_daily_quote
An updated test plan:
1. Apply the patch(es).
2. Run the database update (updatedatabase on koha-testing-docker).
3. Check that the 'QuoteOfTheDay' system preference options
work as expected:
- OPAC: QOTD only appears in the OAPC
- Staff interface: QOTD only appears in the staff interface
- Both (Select all): QOTD appears in the staff interface and OPAC
4. Run the tests and make sure they pass:
prove t/db_dependent/Koha/Quotes.t
5. Sign off!
Sponsored-by: Koha-Suomi Oy
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d573e4c40cec94eaf0aa175cc8da74c94cf6c9ce
Author: Emmi Takkinen <emmi.takkinen at outlook.com>
Date: Fri Jul 10 10:20:56 2020 +0300
Bug 16371: Add database updates
Sponsored-by: Koha-Suomi Oy
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2e818915bec60fd579ed17c45d19b1f32a18e743
Author: Emmi Takkinen <emmi.takkinen at outlook.com>
Date: Thu Jul 9 11:55:03 2020 +0300
Bug 16371: Fix QA issues, change terminology
Sponsored-by: Koha-Suomi Oy
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 27fb149673bf30eea38f1888159c866960aa0b54
Author: Emmi Takkinen <emmi.takkinen at outlook.com>
Date: Mon Apr 27 08:55:38 2020 +0300
Bug 16371: Fix tests
Tests failed due ids already existing in 'quotes' table.
This patch removes hardcoded ids from tests.
Sponsored-by: Koha-Suomi Oy
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 38b05bcd2721d9e65d2b2f4a12a64b4fa7ead593
Author: Emmi Takkinen <emmi.takkinen at outlook.com>
Date: Tue Apr 14 12:51:50 2020 +0300
Bug 16371: Use multi-select on syspref
This patch replaces textbox with multi-select dropdown on
syspref 'QuoteOfTheDay' and changes tests to match this change.
To test:
1. Check 'OPAC', 'staff client' or both on 'QuoteOfTheDay'.
2. Make sure that quote is displayed on (both) mainpage(s).
Prove t/db_dependent/Koha/Quotes.t
Sponsored-by: Koha-Suomi Oy
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 13d9bdc74417f337106070f85332a7ef24331878
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date: Mon Apr 25 11:22:04 2016 +0300
Bug 16371: Quote of the Day (QOTD) - Display in different interfaces
Set 'QuoteOfTheDay'-syspref to 'opac intranet' to allow displaying news in the
opac and the staff client.
Add 'commandline' to allow news in the commandline (where applicable)
Accepts all values accepted by the C4::Context->interface()
Test plan:
1. Set 'QuoteOfTheDay' syspref as 'intranet' or 'opac' or both
2. Check that quote is visible on both mainpages
Prove t/db_dependent/Koha/Quotes.t
Sponsored-by: Koha-Suomi Oy
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a923dccab30c2a87cd1f14b60280cf31f8c4f62e
Author: Emmi Takkinen <emmi.takkinen at outlook.com>
Date: Tue Apr 7 11:53:17 2020 +0300
Bug 16371: Add needed Koha::Exception
Add Koha::Exception needed in this bug.
Sponsored-by: Koha-Suomi Oy
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 77d97dc60ef6663937207af5c9e237ef70de4229
Author: Emmi Takkinen <emmi.takkinen at outlook.com>
Date: Mon Apr 20 15:20:18 2020 +0300
Bug 16371: Rename test file
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f32f92cb577e01d638b1adbc3f065b511eb77d4a
Author: Emmi Takkinen <emmi.takkinen at outlook.com>
Date: Fri Apr 17 11:28:55 2020 +0300
Bug 16371: Move GetDailyQuote to get_daily_quote
This patch moves subroutine 'GetDailyQuote' to new
Koha::Quote object and adjusts tests.
To test:
1. Set 'QuoteOfTheDay' as 'enable'
2. Check that quote is displayed on OPAC mainpage
Prove t/db_dependent/Koha/GetDailyQuote.t
Sponsored-by: Koha-Suomi Oy
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4c01343a360419752f6c5e198ee22e6857b5d670
Author: Emmi Takkinen <emmi.takkinen at outlook.com>
Date: Fri Apr 17 10:57:27 2020 +0300
Bug 16371: Add Koha::Quote[s] classes
Sponsored-by: Koha-Suomi Oy
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6d7e7fc066c93b3893527ec3de0e34b2fc4fe58f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Aug 11 12:41:57 2020 -0300
Bug 25348: (QA follow-up) Silence irrelevant warnings
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ed6a65c1ddacaa80fe825056cc77c3a3170af683
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri May 1 12:24:44 2020 -0400
Bug 25348: Add support for circulation status 12 ( lost )
We should support the SIP2 "circulation status" value 12, "lost".
Test Plan:
1) Apply this patch
2) prove t/db_dependent/SIP/Transaction.t
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 ca44a3f2ca82371bd6a2d731b7b4fd185d9fd93a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri May 1 12:16:48 2020 -0400
Bug 25347: Add support for circulation status 11 ( claimed returned )
Now that we have return claims in Koha, we should support the SIP2
"circulation status" value 11, "claimed returned".
Test Plan:
1) Apply this patch
2) prove t/db_dependent/SIP/Transaction.t
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 be719f30e4142e92d23f3a0566eca93f75224fc3
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri May 1 12:04:37 2020 -0400
Bug 25344: Add support for circulation status 10 ( item in transit )
We should support the SIP2 "circulation status" value 10, "in transit
between library locations"
Test Plan:
1) Apply this patch
2) prove t/db_dependent/SIP/Transaction.t
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 f916269465df99818fb15c108820d3b666968d39
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jul 31 11:14:20 2020 -0300
Bug 26114: ILL should mark status=RET only if a return happened
The original code assumed every codepath should be trated as a
successful check-in. Such is not the case and the regression tests
verify that the code acknowledges this.
To test:
1. Apply the regression tests patch
2. Run:
$ kshell
k$ prove t/db_dependent/Illrequests.t
=> FAIL: Tests fail
3. Apply this patch
4. Repeat 2
=> SUCCESS: Tests pass!
5. Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8b106ed9c4b0588502c6dd485de2aec6a80b32c6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jul 31 11:14:09 2020 -0300
Bug 26114: Regression tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ba8eeca3865bfcd77717e7a225279d5fb77c9989
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Aug 12 14:44:52 2020 -0300
Bug 26132: (QA follow-up) Make tests more robust
Tests fail is SearchEngine is set to Elasticsearch. This patch makes
tests build 'real' biblios.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0dd05fc90a735b9e22359fcb461bdc9291e7a85f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Aug 4 19:01:30 2020 +0000
Bug 26132: (follow-up) Count all checkouts if no limits needed
Signed-off-by: Nick Clemens <nick 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 53bd7b4075bef3f9ddbf6aeec561d99579fdd6e7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 4 12:22:06 2020 +0200
Bug 26132: Tidy _check_max_qty
This is only a perltidy of _check_max_qty to remove some space
inconsistencies, like:
if( $max_checkouts_allowed eq '' ){ return;}
if ( $checkout_count - $onsite_checkout_count >= $max_checkouts_allowed ) {
Signed-off-by: Nick Clemens <nick 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 c6f819840a891e493582026c307797ef7d31c5f0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 4 12:21:26 2020 +0200
Bug 26132: Don't prefetch if not needed
We only need to prefetch items if CircControl is set to ItemHomeLibrary
Signed-off-by: Nick Clemens <nick 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 f7fcd69a11d4914dc6f3212192d90a06ecab12c3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 4 12:12:56 2020 +0200
Bug 26132: Remove raw SQL query for patron_maxissueqty
Same as before but for patron_maxissueqty
Signed-off-by: Nick Clemens <nick 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 1af5b8a7d72c8e49f857907c85809a38ee5b1a07
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 4 12:05:53 2020 +0200
Bug 26132: Remove raw sql query
Making use of Koha::Checkouts make the code much more readable here.
It fixes 2 flaws:
* $type was not quote escaped
* the effective itemtype was not used which could lead to wrong
calculation (for instance item-level_itypes is set but the item does
not have the itype defined)
However there is something to note, we are going to make things a bit
less effective as we are now fetching the items to get their effective
itemtype (vs a SUM done at DB level)
Signed-off-by: Nick Clemens <nick 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 3239993fb1f3eafb2eca4004d5bd9a74e9995c1e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 3 18:25:10 2020 +0200
Bug 26132: TooMany refactoring
The different calls to _check_max_qty can be improved to highlight what
is really changing between each of them.
Signed-off-by: Nick Clemens <nick 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 ee8fe4d35127904e59038b6a5dd77a8096d98624
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 13 10:14:49 2020 +0200
Bug 21946: DBIC schema changes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ed3e4540d73c1c3009375ad339e09a2e676fa1bd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 13 08:00:23 2020 +0000
Bug 21946: DBRev 20.06.00.022
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f0dad7ba511c5e387277ea5cbd6056c66f9fe4b1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 4 10:39:24 2020 +0200
Bug 21946: Restore defined vs ""
The tests still pass. Was the original change really useful?
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c6dfd6801f20b0faa5e2b6ea4f783a4e3233f2de
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Aug 3 12:27:15 2020 +0000
Bug 21946: (follow-up) Restore join to biblioitems
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a86a1a74b98ed92e27e9f16d4336555dd763bce4
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jul 29 12:08:22 2020 +0000
Bug 21946: (follow-up) Add a hint
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ccc7b3c8947c190b511ce5535382e50793f24c26
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jul 28 13:17:54 2020 +0000
Bug 21946: (follow-up) Add optgroup label in circ rules
This patch adds a label to the optgroup showing child itemtypes in the
circulation and fine rules interface.
The parent itemtype description is the optgroup label, and then the
parent itemtype is repeated as an <option> with the additional label
"All"
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6655961517b36c16b92ca5880f4dcf260ce4052f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 17 15:18:09 2020 +0000
Bug 21946: Add test for parent method
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b6f2c4ac2d714edc1e35e3eb7749f9bb512c1a62
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jan 8 12:30:41 2020 +0000
Bug 21946: Update unit tests to pass under ES
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7ebc85da16f5cbc48bf4041ef8b0cc9b1d794f9f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 9 20:00:16 2019 +0000
Bug 21946: Display parent-child relationship on smart-rules.pl
To test:
1 - Set some itemtypes to have a parent
2 - Browse to Administration -> Circulation and fines rules
3 - Note new description of parent/child relationships at top of page
4 - Note that itemtype dropdown for circ rules shows child types under parents
5 - Set a rule for a child type
6 - Note it displays as Parent->Child
7 - Have three child types under a parent
8 - Set the parent 'Current checkouts allowed' to 3
9 - Set the children 'Current checkouts allowed' to:
type1 = 2
type2 = 1
type3 = 1
10 - Create some items of the type above
11 - Note you can checkout 2 of type 1, and not 3
12 - Note you can checkout 1 of type 2, but not 2
13 - Note that you now cannot checkout any of type3
14 - Note you cannot checkout any of the parent type
15 - Return one of the other items and note you can now checkout an item of type3
16 - Return another item and note you can checkout an item of the parent type
17 - Return all
18 - Set the parent type to 1
19 - Now note you can only checkout 1 of any of the children
20 - Set the parent to 0
21 - Note you cannot checkout any of the child types
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 453fd5ce9012e247d552e7f93c367e4810de0939
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 2 14:47:16 2019 +0000
Bug 21946: Update Administration->Item types to allow for defining parent types
To test:
1 - Browse to Administration -> Item types
2 - Not a new colum for prent type
3 - Edit an existing type and not you can select any type (except the current) as a parent
4 - Select one
5 - Edit the type you selected as parent
6 - Note it cannot have a parent defined
7 - Edit a new type, note you can select a parent
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4f3a0a4b89c78c9fff1673787893067f66970cf4
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed May 1 09:57:50 2019 +0000
Bug 21946: Update C4::Circulation->TooMany to check parent itemtypes
To test:
1 - prove -v t/db_dependent/Circulation/TooMany.t
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
JD amended patch: tidy the subtest
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0545feb876f3bc673ee7a5f4de2fc66644cb35c6
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Mar 13 00:36:48 2019 +0000
Bug 21946: Database updates
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0570d1fd24fff4e23adc2f0de4e4f9bdc0a98d8f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 13 08:09:10 2020 +0200
Bug 26179: Add Timothy Alexis Vass to contributors
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 292 +++++++++--------
C4/Koha.pm | 75 -----
C4/SIP/ILS/Item.pm | 33 +-
Koha.pm | 2 +-
Koha/ItemType.pm | 25 ++
Koha/{CsvProfile.pm => Quote.pm} | 12 +-
Koha/Quotes.pm | 121 +++++++
Koha/Schema/Result/Itemtype.pm | 48 ++-
Koha/Template/Plugin/ItemTypes.pm | 7 +-
admin/itemtypes.pl | 8 +
docs/contributors.yaml | 3 +
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/sysprefs.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 36 +++
.../prog/en/modules/admin/itemtypes.tt | 78 ++++-
.../prog/en/modules/admin/preferences/opac.pref | 10 +-
.../prog/en/modules/admin/smart-rules.tt | 44 ++-
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 8 +
.../intranet-tmpl/prog/en/modules/tools/quotes.tt | 5 +-
.../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +-
mainpage.pl | 4 +-
opac/opac-main.pl | 7 +-
t/db_dependent/Circulation/TooMany.t | 357 ++++++++++++++++++---
t/db_dependent/Illrequests.t | 64 +++-
t/db_dependent/Koha.t | 63 +---
t/db_dependent/Koha/GetDailyQuote.t | 84 -----
t/db_dependent/Koha/ItemTypes.t | 115 +++----
t/db_dependent/Koha/Quotes.t | 108 +++++++
t/db_dependent/SIP/Transaction.t | 70 +++-
29 files changed, 1154 insertions(+), 531 deletions(-)
copy Koha/{CsvProfile.pm => Quote.pm} (86%)
create mode 100644 Koha/Quotes.pm
delete mode 100644 t/db_dependent/Koha/GetDailyQuote.t
create mode 100644 t/db_dependent/Koha/Quotes.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list