[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.05-35-g4c5ae7f
Git repo owner
gitmaster at git.koha-community.org
Fri May 24 16:07:04 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, 18.11.x has been updated
via 4c5ae7ffc69443c5f3b956a1dc596743afb6c8d6 (commit)
via b0ab8904a81ae2ae590193932d015dcc7006e13d (commit)
via 12cb120742ecffac30f73b7b300c33dcac99762d (commit)
via c6ca2dfcd344796ca01185776118b73820ca79a9 (commit)
via b95682f73549cd9ddda73c61a54a4b45b0443cbe (commit)
via 41971fd6dafaab903f8b23a89321d82114dac93d (commit)
via d32f1296795a4f2bae9c1ff5504c2b7133fa3c87 (commit)
via 07738ea63b0386095f97111b6aaf41805b2af7ca (commit)
via 8e4ea14f93075a10a4ed995d6533e425e70b4039 (commit)
via 551fc90f2e5234f5d076f73570809f7266ebc623 (commit)
via 9200fd44b2b0f237860e5e309e769e2e035f0464 (commit)
via 27f7b2b5059cd92b2583ced1a1fec072c5fb06f4 (commit)
via 3c0718c7a78104c1ff2eb359c04341bf1ee10888 (commit)
via cd147f78d7e5ce8b48afa021ffc4f2ede3ebb38f (commit)
from d617065162df47ffaf35fc192f260c702fd62602 (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 4c5ae7ffc69443c5f3b956a1dc596743afb6c8d6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 6 11:55:32 2019 -0500
Bug 22713: Remove unecessary $replacementprice var
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 3b877cc240eb44acafaef1ed5f287eae3dfb7baa)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b0ab8904a81ae2ae590193932d015dcc7006e13d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Apr 25 16:23:22 2019 +0000
Bug 22713: Pass replacement price in to order if defined by MarcItemFieldsToOrder
To test:
1 - Have AcqCreateItems set to 'On ordering' (or set in a basket)
2 - Define MARCItemFieldsToOrder
homebranch: 975$a
holdingbranch: 975$b
itype: 975$y
nonpublic_note: 975$x
public_note: 975$z
loc: 975$c
ccode: 970$c
notforloan: 975$7
uri: 975$u
copyno: 975$n
quantity: 975$q
budget_code: 975$h
price: 975$g
replacementprice: 975$p
3 - Have a marc record with some order info defined as above, including a replacementprice
4 - Add to basket - > from a new file
5 - Don't check for duplicates, add the order
6 - Note the order has no replacementprice, but the item does
7 - Close basket, receive order, do not enter a new replacement price
8 - Note the items replacement price is clear
9 - Apply patch
10 - Repeat
11 - Note when order added to basket it has a replacement price
12 - Note when order is received the replacement price is populated and passed into item correctly
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 57b027734e3c1a315cd11fedbf94771fa8381a30)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 12cb120742ecffac30f73b7b300c33dcac99762d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 8 16:37:40 2019 -0500
Bug 11853: Add tests
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 735d23c299669b40d3e3e2a4fe21b88fc6cca00f)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c6ca2dfcd344796ca01185776118b73820ca79a9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 8 16:37:50 2019 -0500
Bug 11853: Allow to clear the date of birth at the OPAC
A patron is not able to clear their date of birth.
When cleared tt is set to NULL in DB which means, for the patron's
modifications feature, that nothing has been changed.
Test plan:
0/ Do not apply the patch
1/ Edit your personal details at the OPAC
2/ Add a date of birth
3/ On the staff interface, approve the modification request
=> OK it is updated
4/ Edit your personal details and clear the date of birth
5/ On the staff interface
=> KO the table display is wrong, nothing is marked has changed
6/ Approve the modification requiest
=> KO it has not been cleared
7/ Apply the patch and repeat 1 to 6 and confirm that the behaviors are
now correct.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 6692800794cbf403e8be8c8062608b60148c0d56)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b95682f73549cd9ddda73c61a54a4b45b0443cbe
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri May 10 13:24:39 2019 +0000
Bug 22881: Trying to clear search history via the navbar X doesn't clear any searches
This patch undoes a mistake introduced in my patch for Bug 21479. A
"preventDefault()" was added to the search history clear button by
mistake. The "confirmDelete" function only works if the default action
of the link is allowed to complete.
To test you must have the EnableOpacSearchHistory system preference
enabled. Apply the patch and log into the OPAC as a patron who has a
search history.
Click the "X" link in the header next to the "Search history" link.
Confirm that you want to clear your search history. The page should
refresh. Navigate to your account -> Your search history to confirm that
your search history has been cleared.
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: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 6d1b7ff27eb2d53d637c169c7132a66d546c0124)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 41971fd6dafaab903f8b23a89321d82114dac93d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue May 14 18:15:54 2019 +0000
Bug 22899: DBRev 18.11.05.001
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit b90bbc125969dc0048dde2ec37531a6ef6cd2b36)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d32f1296795a4f2bae9c1ff5504c2b7133fa3c87
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue May 14 13:21:55 2019 +0100
Bug 22899: (QA follow-up) Change accessor name
This patch changes pending_hold to has_pending_hold to signify that
we're returning a boolean and not a Koha::Hold object.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5c81d986212b480d9b491e46b3fb4498c0eb2c2c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 07738ea63b0386095f97111b6aaf41805b2af7ca
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue May 14 13:17:01 2019 +0100
Bug 22899: (QA follow-up) Ensure constraint is created
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 49a6aac8b6d8fd13999638f5a6ae4d4481dbf304)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8e4ea14f93075a10a4ed995d6533e425e70b4039
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon May 13 20:09:05 2019 +0000
Bug 22899: Add pending_hold method to Koha::Item
To test:
1 - Enable course reserves
2 - Create a course
3 - Add an item to the course
4 - Attempt to view the course on the OPAC
5 - Internal Server Error
6 - Apply patch
7 - Add an item to the holds queue by placing a hold and running holds queue builder or:
INSERT INTO tmp_holdsqueue (itemnumber) VALUES (###);
8 - View the course page, note item appears 'Pending hold'
9 - Remove the holdsqueue line
10 - View the course page, note item appears 'Available'
11 - prove -v t/db_dependent/Koha/Item.t
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
I see Jonathan's comments about small improvements, but will sign off as
everything works as expected here.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f21ebad7d298f25e44771e5833d1d1d4d6d8f777)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 551fc90f2e5234f5d076f73570809f7266ebc623
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon May 13 20:08:06 2019 +0000
Bug 22899: Database update
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit af1067f3d466cf3bd32c4747c4a00dd7542c1fe0)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9200fd44b2b0f237860e5e309e769e2e035f0464
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri May 10 12:32:23 2019 -0500
Bug 22433: Use Data::Dumper instead of Data::Printer
Data::Printer is not in our deps
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit b5b64e7900fd61bd525409ee869deafde7b8c50a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 27f7b2b5059cd92b2583ced1a1fec072c5fb06f4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 9 13:04:38 2019 -0500
Bug 22433: Add debug statement to Transaction.t
Hard to know what's going on here without more info. Adding this output
may help to investigate more.
Test plan:
Make sure the tests still pass
If it fails, please paste the output!!
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 63a8e27f2e087b698e986e026dc9fa511b2afbfe)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3c0718c7a78104c1ff2eb359c04341bf1ee10888
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 1 13:31:31 2018 -0300
Bug 21709: Replace 'no popup' plugin links with a span
Test plan:
Edit a bibliographic record
Notice that the icons next to fields linked with a plugin can be a link
or not. The browser displays a pointer or not.
It will remove the ambiguity to display an icon that is clickable but
does nothing when clicked.
We could also have another icon to disociate both behaviors.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 9fa97774ae6b3c84028b15f8c768460a012320ea)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit cd147f78d7e5ce8b48afa021ffc4f2ede3ebb38f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri May 10 12:10:42 2019 +0000
Bug 22782: DBIC update for SocialData
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5ecbe281aff13e53d4fbc5064714de9209410358)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Items.pm | 2 +-
C4/XSLT.pm | 4 +-
Koha.pm | 2 +-
Koha/Item.pm | 14 ++++++
Koha/Patron/Modification.pm | 14 ++++--
Koha/Patron/Modifications.pm | 6 ++-
Koha/Schema/Result/Item.pm | 19 ++++++-
Koha/Schema/Result/SocialData.pm | 7 +--
Koha/Schema/Result/TmpHoldsqueue.pm | 29 +++++++++--
acqui/addorderiso2709.pl | 4 +-
installer/data/mysql/kohastructure.sql | 6 ++-
installer/data/mysql/updatedatabase.pl | 19 +++++++
.../prog/en/modules/cataloguing/addbiblio.tt | 2 +-
.../bootstrap/en/includes/item-status.inc | 2 +-
.../bootstrap/en/includes/opac-bottom.inc | 3 +-
t/db_dependent/Items.t | 4 +-
t/db_dependent/Koha/Item.t | 52 ++++++++++++++++++++
t/db_dependent/Koha/Patron/Modifications.t | 41 ++++++++++++++-
t/db_dependent/SIP/Transaction.t | 5 +-
19 files changed, 204 insertions(+), 31 deletions(-)
create mode 100644 t/db_dependent/Koha/Item.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list