[koha-commits] main Koha release repository branch master updated. v19.05.00-259-g162ea12
Git repo owner
gitmaster at git.koha-community.org
Mon Jul 1 17:41:11 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 162ea12db99e3ad2face427548a1f4e6f469ef77 (commit)
via 0619aab9971c7f4d4859620abbac7ad2bfe93364 (commit)
via 0404ecec4b619ebe14ac262332870004bb88878c (commit)
via 563458f20e413388d11cf92ea36d2867f488416f (commit)
via 29da30e1d458a0fa75444933ba441eb7906f53fa (commit)
via 5dec7bee96b9459f2f57773666de71090d945c66 (commit)
via 094df0ed14f97b9ecd10a8934442dbbb670e0ab3 (commit)
via e30f09af910425f5d496efd0dd6ca8f7de468fb0 (commit)
via 98914ed6bb265959356406b9a9bc569919df6125 (commit)
via d0c2138c8c71309cdeb5011f0a5e1263ff202cef (commit)
via fa1cb9d648c879449dc2fd9120848d015dc64079 (commit)
via 64a2583c48cbcf25222a946ac6376f3be3bd4667 (commit)
via 8bcffcd1d0dd3ca72770d8fd129dea3b10ae1894 (commit)
via d52ec38cef9c655cd15bce2c16653f12e239fb05 (commit)
via 86f37b1eb3a3376f475e69d351f0b0983b2b482a (commit)
via 54791a5c4639d8d5380077b38ddf9a1c0c47f253 (commit)
via e749afc938615f273d2966aed31fe387d8d36b64 (commit)
via d2cb9fdaffe507bbe3f90565fa8228802b3c4918 (commit)
via f261dc4df6f1b55ce42a57987776fe4b6631d3cd (commit)
via ecc70a68be5f4737b5c5c96305ff302cd8553ed0 (commit)
via 676f03dd7dc50ae855df7a85a81d899f2b3074b3 (commit)
via dc94b4d05b4a28e9eee75439e2f53dd0d62176fa (commit)
via f927d801121f9d7b291516649cf3b55be49b8e3d (commit)
via 545f38d13c210e4cb173e67d2578d825a9ffeb47 (commit)
via f317d384f657bb8341a1a641343e18ed9598240d (commit)
via f5d3dec2e4ddfa20006cd9f81e28616b36230685 (commit)
from bb80b2d38b9861e7e81b76608cc097654b27fcb4 (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 162ea12db99e3ad2face427548a1f4e6f469ef77
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jun 28 15:27:27 2019 +0000
Bug 17003: (QA follow-up) Fix the number of tests
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0619aab9971c7f4d4859620abbac7ad2bfe93364
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Mar 29 07:53:27 2019 +0000
Bug 17003: (follow-up) Update definitions according to voted RFC
Test plan:
1) Have some patrons with checkouts, some renewable and some not
renewable
2) Use your favorite API tester and access GET
http://koha.url/api/v1/checkouts/{checkout_id}/allows_renewal
3) Check the response is OK according to voted RFC:
https://wiki.koha-community.org/wiki/Checkouts_endpoint_RFC#Checkout_renewability_2
4) prove t/db_dependent/api/v1/checkouts.t
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Johanna Raisa <johanna.raisa at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0404ecec4b619ebe14ac262332870004bb88878c
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Feb 21 02:30:00 2019 +0000
Bug 17003: Adapt to OpenAPI
Test plan:
prove t/db_dependent/api/v1/checkouts.t
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Johanna Raisa <johanna.raisa at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 563458f20e413388d11cf92ea36d2867f488416f
Author: Lari Taskula <larit at student.uef.fi>
Date: Mon Aug 22 17:35:44 2016 +0300
Bug 17003: Add API route to get checkout's renewability
Signed-off-by: Johanna Raisa <johanna.raisa at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 29da30e1d458a0fa75444933ba441eb7906f53fa
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jul 1 16:06:42 2019 +0100
Bug 17492: (RM follow-up) Use more specific method name
Changed the method introduced into Koha::Patron from is_category_valid
to the more specific is_valid_age to clarify it's intent to future
developers.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5dec7bee96b9459f2f57773666de71090d945c66
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jun 28 15:15:06 2019 +0000
Bug 17492: (QA follow-up) Correct template variable
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 094df0ed14f97b9ecd10a8934442dbbb670e0ab3
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Jun 26 18:31:44 2019 +0000
Bug 17492: (follow-up) Add missing filters
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e30f09af910425f5d496efd0dd6ca8f7de468fb0
Author: Radek Šiman <rbit at rbit.cz>
Date: Mon Oct 24 03:41:02 2016 +0200
Bug 17492: Add a warning about age being of-limits and a button to update it
This patch adds a warning if a patron's age is out of limits if an assigned category.
It also adds a button allowing to change the category.
Test plan:
1) Apply patch
2) Create a patron and assign him a category having age limits set
3) Change patron's age to be older/younger than category's limits
4) At "Check out" and "Details" tabs you should see a warning with a
button allowing to change the category, eg.:
- http://prntscr.com/cz7ch3
- http://prntscr.com/cz7em4
- http://prntscr.com/cz7dj1
5) Set a valid category according to patron's age
6) Warning should disappear
7) Perform similar test again, but instead of changing the age change
the limits of a category
8) During tests verify "Change category" button everytime opens "Modify
patron" page:
http://prntscr.com/cz7g5q
9) Ensure that left-side panel is always on its expected place
10) Remove patron's date of birth and test that all categories are
allowed now
11) Run automated tests: prove t/db_dependent/Koha/Patron.t
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 98914ed6bb265959356406b9a9bc569919df6125
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jul 1 15:17:38 2019 +0100
Bug 18928: DBRev 19.06.00.010
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d0c2138c8c71309cdeb5011f0a5e1263ff202cef
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jun 28 14:50:26 2019 +0000
Bug 18928: (QA follow-up) Remove DBIC files and reference to DefaultCircRule
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fa1cb9d648c879449dc2fd9120848d015dc64079
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jun 11 10:05:24 2019 -0500
Bug 18928: (bug 22847 follow-up) Display correctly the values (not the propagated ones)
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 64a2583c48cbcf25222a946ac6376f3be3bd4667
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 6 12:10:58 2019 -0500
Bug 18928: Remove '(not set)'
The "(not set)" part must be removed IMO, I am not sure I understand its goal.
Now that we have 1 entry per rule (and not 1 DB row for the whole "Default
checkout, hold and return policy for Centerville" table), it will be harder
to handle it correctly. Not impossible, but if not really needed I would prefer
to just remove it. If a rule is not set, the cell is empty or the dropdown list
displays the option "Not set", which seems to correct the problem.
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8bcffcd1d0dd3ca72770d8fd129dea3b10ae1894
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri May 3 17:39:28 2019 -0400
Bug 18928: (bug 22847 follow-up) Display correctly the values (not the propagated ones)
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d52ec38cef9c655cd15bce2c16653f12e239fb05
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri May 3 16:47:59 2019 -0400
Bug 18928: (bug 22679 follow-up) Do not remove all rules along with the issuing rule
We actually want to remove maxissueqty, maxonsiteissueqty and max_holds (for now)
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 86f37b1eb3a3376f475e69d351f0b0983b2b482a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 29 11:14:27 2019 -0400
Bug 18928: Use get_effective_rule in GetBranchItemRule
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 54791a5c4639d8d5380077b38ddf9a1c0c47f253
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 29 11:03:13 2019 -0400
Bug 18928: DBIC schema update
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e749afc938615f273d2966aed31fe387d8d36b64
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Apr 24 21:11:29 2019 +0000
Bug 18928: (follow-up) Unset max_holds rule if needed
Test plan:
1) Set all values in Default checkout, hold and return policy section on
circulation rules admin page, try for all libraries and for one specific
library. Save.
2) Click on unset and confitm
--> without patch, the Maximum total holds allowed value remains
--> with patch the unset removex Maximum holds value too
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d2cb9fdaffe507bbe3f90565fa8228802b3c4918
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Mar 6 09:51:28 2019 -0300
Bug 18928: (follow-up) Make DB update idempotent
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f261dc4df6f1b55ce42a57987776fe4b6631d3cd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 21 17:27:57 2019 -0300
Bug 18928: Update new occurrences
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ecc70a68be5f4737b5c5c96305ff302cd8553ed0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 24 19:40:24 2018 -0300
Bug 18928: Add missing filters
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 676f03dd7dc50ae855df7a85a81d899f2b3074b3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 24 19:32:48 2018 -0300
Bug 18928: Add DB structure changes
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit dc94b4d05b4a28e9eee75439e2f53dd0d62176fa
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jul 11 11:10:01 2017 -0400
Bug 18928: Move holdallowed, hold_fulfillment_policy, returnbranch to circulation_rules
Test Plan:
1) Apply dependancies
2) Apply this patch set
3) Run updatedatabase.pl
4) Ensure holdallowed and hold_fulfillment_policy rules behavior remains unchanged
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f927d801121f9d7b291516649cf3b55be49b8e3d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jun 7 10:14:36 2019 +0000
Bug 23045: Return record along with errors
We don't seem to directly handle the errors in most cases, let's always return the record
To test:
1 - Add some blank lines to editor, previous patch is okay with this
2 - Add a line with just 'e' or some other incomplete field
3 - Try to save
4 - Note JS leader error
5 - Apply this patch
6 - No errors
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 545f38d13c210e4cb173e67d2578d825a9ffeb47
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jun 4 14:25:53 2019 +0000
Bug 23045: TextMarc errors on blank lines
Since bug 16251 we use TextMarc to get some record fields, however, it throws an error when
processing blank lines.
We should just pass on these rather then erroring
To test:
1 - Define a new macro that delete more fields than it adds
delete 245
2 - Run it
3 - Note an error in JS console, and helpers will not load
4 - Apply patch
5 - Reload, try again
6 - No error
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f317d384f657bb8341a1a641343e18ed9598240d
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>
commit f5d3dec2e4ddfa20006cd9f81e28616b36230685
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>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 66 ++--
Koha.pm | 2 +-
Koha/Biblio.pm | 6 +-
Koha/IssuingRule.pm | 5 +
Koha/Patron.pm | 18 +
Koha/REST/V1/Checkouts.pm | 45 +++
Koha/Schema/Result/Branch.pm | 34 +-
Koha/Schema/Result/BranchItemRule.pm | 130 -------
Koha/Schema/Result/DefaultBranchCircRule.pm | 104 ------
Koha/Schema/Result/DefaultBranchItemRule.pm | 104 ------
Koha/Schema/Result/DefaultCircRule.pm | 92 -----
Koha/Schema/Result/Itemtype.pm | 34 +-
admin/smart-rules.pl | 367 +++++++++-----------
api/v1/swagger/definitions.json | 3 +
api/v1/swagger/definitions/allows_renewal.json | 21 ++
api/v1/swagger/paths.json | 3 +
api/v1/swagger/paths/checkouts.json | 30 ++
circ/circulation.pl | 7 +
installer/data/mysql/kohastructure.sql | 62 ----
installer/data/mysql/updatedatabase.pl | 91 +++++
.../intranet-tmpl/lib/koha/cateditor/text-marc.js | 6 +-
.../prog/en/includes/cateditor-widgets-marc21.inc | 1 +
.../prog/en/includes/category-out-of-age-limit.inc | 4 +
.../prog/en/modules/admin/smart-rules.tt | 133 ++++---
.../prog/en/modules/circ/circulation.tt | 4 +
.../prog/en/modules/members/moremember.tt | 9 +-
members/moremember.pl | 8 +
t/db_dependent/Circulation/Branch.t | 67 ++--
t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 4 -
t/db_dependent/Circulation/TooMany.t | 4 -
t/db_dependent/Holds.t | 36 +-
.../Holds/DisallowHoldIfItemsAvailable.t | 35 +-
t/db_dependent/Holds/HoldFulfillmentPolicy.t | 48 ++-
t/db_dependent/Holds/HoldItemtypeLimit.t | 19 +-
t/db_dependent/HoldsQueue.t | 133 ++++---
t/db_dependent/Koha/Biblio.t | 5 +-
t/db_dependent/Koha/IssuingRules.t | 15 +-
t/db_dependent/Koha/Patrons.t | 60 +++-
t/db_dependent/Reserves.t | 36 +-
t/db_dependent/TestBuilder.t | 2 -
t/db_dependent/api/v1/checkouts.t | 19 +-
41 files changed, 875 insertions(+), 997 deletions(-)
delete mode 100644 Koha/Schema/Result/BranchItemRule.pm
delete mode 100644 Koha/Schema/Result/DefaultBranchCircRule.pm
delete mode 100644 Koha/Schema/Result/DefaultBranchItemRule.pm
delete mode 100644 Koha/Schema/Result/DefaultCircRule.pm
create mode 100644 api/v1/swagger/definitions/allows_renewal.json
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list