[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.08-33-ga27a32c
Git repo owner
gitmaster at git.koha-community.org
Mon Aug 27 15:26:57 CEST 2018
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, 17.11.x has been updated
via a27a32cab66a0c6a529d0f7918256d5615737dea (commit)
via 800ca2f6d88217a8ca706999eb603d98e6487d2f (commit)
via 31262bf4c5754c39cff3f510fc7af6d4eaf531b3 (commit)
via b9dbce17b4c1121a9c46273f6e43cc3b91ff4cbb (commit)
via 04ca9e923f4b5d0f0c8f78b9e08742b899dd7d3f (commit)
via 2d3b25b04ea6a47ed0f5ebdc3e10fb16b474184f (commit)
from 60ee36a1e025bd1f075957b7875b8fa5111fc2cf (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 a27a32cab66a0c6a529d0f7918256d5615737dea
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Aug 21 11:25:53 2018 +0000
Bug 20773: DBRev 18.05.02.003
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 7dab4cd903f9623fb52592e65d57c93b6156d2aa)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 31bf49b849a949c9f809d2ca2eaa1cecafb55036)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 800ca2f6d88217a8ca706999eb603d98e6487d2f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed May 16 15:39:04 2018 +0200
Bug 20773: (bug 20724 follow-up) Add a simple db revision
We should correct bad data too.
This is a trivial, pragmatic approach. Instead of doing a complex
calculation with holidays etc. (as was done on 12063), we just add
MaxPickupDelay or 7 days to today probably resulting in a little bonus
time. Only for waiting holds. When the ReservesNeedReturns pref was not
Automatic, there should be no changes.
== Test plan ==
1. git checkout c585f1149770ec401f188e061211501897cec0bf~1
This the commit before bug 20724's patches.
We need that to be able to generate "corrupted data"
2. Set ReservesNeedReturns to "Automatically"
3. Place a hold on a specific item
4. The hold should have an *empty* expiration date
record page → Hold → "Expiration" column
5. Apply this patch
6. Run updatedatabase.pl
7. Refresh the page
8. The hold should have an expiration date (not empty)
9. Celebrate! 🎉🎊🥳
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Bug 20773: (followup) Remove MySQLism
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit a4ec768e3787ff3ee426949c0f03188dd4d15e82)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 6eb334e244a2cbaf84d8ac874348c1443252e656)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 31262bf4c5754c39cff3f510fc7af6d4eaf531b3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed May 16 14:43:27 2018 +0200
Bug 20724: (QA follow-up) Remove two obsolete comment lines
No test plan :)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 88ac8c499f878a1c0ac622d53742a3d9acea1f64)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b9dbce17b4c1121a9c46273f6e43cc3b91ff4cbb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 10 11:40:33 2018 -0300
Bug 20724: Add tests for ReservesNeedReturns
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 8b6dc6b23ccb26e18c437a578b4e20174ee1ea58)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 04ca9e923f4b5d0f0c8f78b9e08742b899dd7d3f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 10 11:40:11 2018 -0300
Bug 20724: Move the ReservesNeedReturns logic to AddReserve
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 1798d22e764bebf46e2915e1c0b7c3360ea8dd51)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 2d3b25b04ea6a47ed0f5ebdc3e10fb16b474184f
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Thu May 10 08:12:04 2018 -0400
Bug 20724: Correctly mark an hold as waiting - ReservesNeedReturns
We need to call Koha::Hold->set_waiting to correctly
calculate the expiration date.
It fixes a regression introduced by
commit 26634151dbce0bf39ff6c9eda5b58bb993996a2d
Bug 12063 - Fix QA failures
The expiration date has to be set for waiting holds
== Test plan (time to execute: less than 4min) ==
1. Set ReservesNeedReturns to "Don't automatically"
2. Place a hold on a specific item
3. Check it in and confirm hold
4. The hold should have an expiration date
record page → Hold → "Expiration" column
5. It should be listed in staff:/cgi-bin/koha/circ/waitingreserves.pl
6. Set ReservesNeedReturns to "Automatically"
7. Place a hold on a specific item
(which should also behave like we check the item in to
keep it for the patron)
8. The hold should have an *empty* expiration date
record page → Hold → "Expiration" column
9. Holds awaiting pickup page should crash
staff:/cgi-bin/koha/circ/waitingreserves.pl
10. Cancel the hold to remove the corrupted data
record page → Hold → the red X
11. Apply this patch
12. Place a hold on a specific item
13. The hold should have an expiration date (not empty)
14. It should be listed in staff:/cgi-bin/koha/circ/waitingreserves.pl
15. Celebrate!
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit c585f1149770ec401f188e061211501897cec0bf)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Reserves.pm | 11 +++++++
Koha.pm | 2 +-
installer/data/mysql/updatedatabase.pl | 11 +++++++
opac/opac-reserve.pl | 8 -----
reserve/placerequest.pl | 12 -------
t/db_dependent/Reserves.t | 56 +++++++++++++++++++++++++++++++-
6 files changed, 78 insertions(+), 22 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list