[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.13-36-ga84c842
Git repo owner
gitmaster at git.koha-community.org
Sun Oct 29 20:00:27 CET 2017
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, 16.11.x has been updated
via a84c842f0930b7e216f3c0d53791b414912c4e9f (commit)
via 37116a485e56e81977d3fcb6be2dd6ce8798940d (commit)
via 2831770a9557263b0e4edf3bdc4f17c82475bced (commit)
via 5a6dafd94f0a60a8e115d6923de5a7d878242201 (commit)
via 7c8c222cc03cb9d9d63356caeb6eb125776c370a (commit)
via 6c918b0eff7b0410be86effdcb79d0fa75e3b653 (commit)
via 8c50bbb1820af8694e4ed1d03638d2819d88f8c0 (commit)
via 4c8f4f8fa689b471243108d689bd25d3a3f38b27 (commit)
via 34627a8aa9bd276df8628b4761b84bb6b95230ba (commit)
via 95f05ba81c6c5946a52d61b886a391e0c5a40624 (commit)
via cb95d0bfbfec1344acdce7365539abd8a810d711 (commit)
via 52305a98fa9d90c62fe80b38bd79c97c9ac81fe5 (commit)
via 82f96442837da730bbf3543378ca2801e3316303 (commit)
via 74d13d33ca2a9ef5d4ac7050ee489ed23105731c (commit)
via 02973f2770810c688c1f3339166e174b75721e1a (commit)
via c175959d59d9bc9b85f0e508b2ce00b7b2b075c0 (commit)
via e371e274c6ccb8970177a050ee5cef1bfb42fc9d (commit)
via 876d9550273b8fc9cca1921a529a8928a97b763b (commit)
via bd65ae719e31ffa1bebba410af97f60d6d1a1691 (commit)
via 79a54aa37e57966160581c0773efcf51e132815d (commit)
via dc7a7958f56980b5bad54c6a49182f2870a8d5bc (commit)
via 1cf8f511153d959b46e69cb7bc1f0f7bea5d2242 (commit)
via 4481acb5d7ce8089a0c7b45298f9419f8910b327 (commit)
via a26aacbc4e07e8fcc7a170a654a81979defecc0b (commit)
via 6fb761fbf7c4446a5e54c9d4fbd31e4b55e88189 (commit)
via 5bf350c2de09218e7ffa83b93b968964c5987837 (commit)
via 77db31a583ecb6bcb86b0f44b8108c10efd46fc9 (commit)
via aec169578298e56bb41cf0534442231486187d5a (commit)
via 5cd43029a2e1993e275be12227f86daaec746fb3 (commit)
via e2ee7118d0c97cb008b242b61a00a98f2c6e62c6 (commit)
via ea2dd33e30af5e69c546f4330a892bebcdaf0cfd (commit)
via b7c622aef048d137eca9be6e30497c5c92d79c7e (commit)
via c1d72e60df9ac1378ed7a8d0be903ab8be34c86a (commit)
via 73213fbefc06dea7c98df3363a6a8ca6621a3e20 (commit)
via a19c652f8faeb9c3477fe5fc4f03eb33f525e494 (commit)
via 2ce56249346ba9262ea81deab63eb10274345064 (commit)
from 9fa91c75a967fdadff9d28791449bdae63c54d2a (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 a84c842f0930b7e216f3c0d53791b414912c4e9f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 6 12:30:18 2017 -0300
Bug 19423: Prevent DecreaseLoanHighHolds.t to fail randomly
CanBookBeIssued returns STATS if categorycode is X
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 090b450a502340e3d03b5ee6a075cc92e647aada)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit fc4ee4aeec28c0f99e8432d4ce7748b7f628d85c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 37116a485e56e81977d3fcb6be2dd6ce8798940d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Aug 28 16:27:41 2017 +0000
Bug 19193: When displaying the fines of the guarantee on the guarantor account, price is not in correct format
1 - Have a patron with guarantees
2 - Charge some fines to the guarantees
3 - View the patron
4 - Fines are displayed unformatted
5 - Apply patch
6 - Refresh
7 - Fines should now be formatted correctly
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.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 0d124e1bc322e6823c192c51effa0f3eecb2ac1f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 448c1206f82c039fa90c8ad480c384a578f39acb)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2831770a9557263b0e4edf3bdc4f17c82475bced
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Nov 21 12:08:52 2016 -0500
Bug 17664: Silence non-zebra warnings in t/db_dependent/Search.t
TEST PLAN
---------
0) back up database
1) drop database; create database
2) run web installer
3) prove t/db_dependent/Search.t
-- the spammy warnings (other than zebra index warnings) may
already be fixed, but the mocked value was not realistic.
4) apply patch
5) prove t/db_dependent/Search.t
-- notice only zebra index warnings.
6) run qa test tools
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
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 5e63a3838102ee1fe8a1bc15640196ab611dbc89)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 23c8acd61590de50bcfa2779afc35fb7d5dd6488)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5a6dafd94f0a60a8e115d6923de5a7d878242201
Author: David Bourgault <david.bourgault at inlibro.com>
Date: Tue Sep 19 13:37:54 2017 -0400
Bug 19345: Add missing error flag to template
Adds a missing error flag to the template->param { } call.
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 078eb77451dacd6042b783edf6f89f5ab95732b5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 96143e8d9e62a0565c996d5fd071b7a9d0407019)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7c8c222cc03cb9d9d63356caeb6eb125776c370a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 2 14:22:27 2017 -0300
Bug 19398: Format date of birth in circ patron search
When searching for a patron from the circulation tab, the results table
shows the date of birth unformatted.
Test plan:
Apply this patch, search for patrons in the circ tab and confirm that
the date of birth are correctly formatted according to the dateformat
syspref
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 4edfc7900f6132c6771e4cfc820a5a3dc08d3e13)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 7453b2c5d8ed7c570e683b1d71712695d0576dcf)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 6c918b0eff7b0410be86effdcb79d0fa75e3b653
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Oct 6 11:39:42 2017 +0200
Bug 19386: [QA Follow-up] Remove some default values
In the meantime bug 19403 added default nulls for gonenoaddress, lost
and debarred. So these lines can be removed safely.
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 12a754a703bc8f4279bb23aab09c39c0514b0a75)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 3e45ba75e95c8e9ad4d20c0043c5530bbce5f018)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 8c50bbb1820af8694e4ed1d03638d2819d88f8c0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 28 17:31:04 2017 -0300
Bug 19386: Prevent t/db_dependent/SIP/Patron.t to fail randomly
Depending on the values used by TestBuilder, some tests from t/db_dependent/SIP/Patron.t can fail
# Failed test 'Not blocked without overdues when set to 'Don't block''
# at t/db_dependent/SIP/Patron.t line 55.
# got: '0'
# expected: '1'
# Failed test 'Not blocked without overdues when set to 'confirmation''
# at t/db_dependent/SIP/Patron.t line 61.
# got: '0'
# expected: '1'
# Failed test 'Not blocked without overdues when set to 'Block''
# at t/db_dependent/SIP/Patron.t line 67.
# got: '0'
# expected: '1'
Caused by this check in C4::SIP::ILS::Patron->new
110 for (qw(EXPIRED CHARGES CREDITS GNA LOST DBARRED NOTES)) {
111 ($flags->{$_}) or next;
[...]
115 if ($flags->{$_}->{noissues}) {
116 foreach my $toggle (qw(charge_ok renew_ok recall_ok hold_ok inet)) {
117 $ilspatron{$toggle} = 0; # if we get noissues, disable everything
118 }
119 }
120 }
Test plan:
Execute several times (50x?) these tests.
Without this patch they may fail
With this patch they must never fail
Signed-off-by: David Bourgault <david.bourgault at inlibro.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 6545cfe3f30789723b6f3c2e6e13af6e6c8e5fb9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 40c444cc2bd664babd30ca4ed70c4953cfb916d5)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 4c8f4f8fa689b471243108d689bd25d3a3f38b27
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 3 11:03:43 2017 -0300
Bug 16726: Do not display "You searched for:" if not needed
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 9dca694b04d0f5e5e0a307e0d5243ce61fb1ef79)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 1a99731640eb9e500221ffb838677f1eb7aa369d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 34627a8aa9bd276df8628b4761b84bb6b95230ba
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Jun 27 04:14:47 2017 +0000
Bug 16726: [FOLLOW-UP] Putting text in h1
Works as outlined in test plan, search terms now appear at top as h1 as well
Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit f24e339dd603e015557107048d1a678293cb2e65)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 0cad7e54cd20211eb12a642ed4074b0f5b232cac)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 95f05ba81c6c5946a52d61b886a391e0c5a40624
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Jun 7 02:09:36 2017 +0000
Bug 16726: Clear text in syspref searchbox after submitting
To test:
1) Go to Admin -> search for a system preference
2) Notice your search stays in the search box (this is inconsistent with
search behaviour across Koha)
3) Apply patch and refresh page
4) Make another search
5) Confirm search still works as expected and search terms have been
cleared from search box
6) Confirm search terms show at the top of the results
Sponsored-by: Catalyst IT
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit f10f6a19c53beb37e3ee0808ef6bb18bd88bef8a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e6fc2dfc80fad354cba1fa514b9a1c2ca75f2f3b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit cb95d0bfbfec1344acdce7365539abd8a810d711
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 29 16:28:13 2017 -0300
Bug 19392: Clean-up behind auth_values_input_www.t
The two categories created by this test script are not removed
Test plan:
without this patch, the two authorised value categories 学協会μμ and
tòmas are not removed when the script finishes.
Now it does!
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 269c21d984ef451dadcad2e803035cc1cd052825)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 354645ef3005ca41d832aea8548944f6f2366089)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 52305a98fa9d90c62fe80b38bd79c97c9ac81fe5
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Sep 29 15:52:50 2017 +0200
Bug 18422: (QA follow-up) Check if select2 is available before using it
cataloging.js might not always be loaded with select2.js, so we should
check its availability to prevent JS errors
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 56a0aabc58a3475912894523cc92757153b967bd)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 1d450ad13a6bcd8f4f826bae7290a3184564badb)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 82f96442837da730bbf3543378ca2801e3316303
Author: Oleg Vasylenko <synapse.ova at gmail.com>
Date: Wed Apr 12 10:45:48 2017 +0300
Bug 18422 - Add Select2 to authority editor
Overview:
Repeat tag fails if authority field has select subfield (for example, UNIMARC 700$8, 800$a)
This patch adds Select2 to authority editor
Steps to Reproduce:
In authority editor repeat field that has select subfield
Actual Results:
Field does not repeat (copy is not created).
Console shows a js TypeError in cataloging.js: «$(...).select2 is not a function»
Expected Results:
Field will repeat (copy is created)
Additional Information:
Error happens in version 16.11+ after adding Select2 js functions. The easiest way to fix is to add Select2 to authority editor
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 2f5a319b0a9f93dde7600decae5df989b842ca58)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit de4fd901d3eef7888dfd84cbe46b2da849885430)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 74d13d33ca2a9ef5d4ac7050ee489ed23105731c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Sep 13 12:06:50 2017 +0000
Bug 19307: Mock the AllowFineOverride preference to ensure expected result
To test:
1 - Set 'AllowFineOverride' to allow
2 - prove t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
3 - 1 test fails
4 - Apply patch
5 - prove t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
6 - All tests pass
7 - Set 'AllowFineOverride' to 'Don't allow'
8 - Tests should still pass
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 1e2e1247c9bcd15514dc395be891a9a3607e5ea5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 86612541a45f6753b0ad87453a62fe8c9ba3047b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 02973f2770810c688c1f3339166e174b75721e1a
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Aug 30 23:26:38 2017 +0000
Bug 16463: Replace discharge link with error message if user has checked out items
To test:
1) Ensure the useDischarge syspref is enabled
2) Check out an item to a borrower
3) Log in to the OPAC as this borrower
4) Click the 'ask for a discharge' link in the nav
5) Click the 'Ask for a discharge' link
6) Notice you cannot be discharged because you have checkouts
7) Apply the patch, click the 'ask for a discharge' link in the nav
8) Notice the link has been replaced with an appropriate error message
9) Attempt to force the discharge URL:
/cgi-bin/koha/opac-discharge?op=request
10) Notice the message and you cannot be discharged.
11) Confirm that when you check in your item, the discharge link shows
again and works as expected.
Sponsored-by: Catalyst IT
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 89528af3b089b2d17e3e7b212ea5608478f0ca84)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 4ea7a76d2666405ba66a085f4ff1a550c8d7ae6e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c175959d59d9bc9b85f0e508b2ce00b7b2b075c0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 19 11:57:10 2017 -0300
Bug 19195: Do not explicitely force scalar context when unecessary
These ones are already called in scalar context
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 8088e3a3379fb8708226cabeadc190f7310d93f4)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit bf637d2dae9a2bfe6cec04ca544b75548498f5bd)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e371e274c6ccb8970177a050ee5cef1bfb42fc9d
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Aug 29 05:02:29 2017 +0000
Bug 19195: Preventing noisy warns when creating or editing a basket
To test:
1) Open the koha intranet error log
2) Go to Acquisitions -> Find or create a vendor
3) Create a new basket, filling all fields
4) Notice warns in error log
5) Edit this basket
6) Notice warns in error log
7) Apply patch
8) Create another basket, confirm warns do not show
9) Edit this basket, confirm warns do not show
Sponsored-by: Catalyst IT
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit e98c178c081d4bb5673e6b04bf817b9c452cba8c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 43279f48e1ad3ebb57d08dd5ec91773f8de2e476)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 876d9550273b8fc9cca1921a529a8928a97b763b
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Oct 25 11:03:00 2017 +0200
Bug 18999: (17.05.x followup) Koha::Acquisition::Order is not an object yet
(cherry picked from commit 1644708857ea3d3de6683bcf8e1300febc977384)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit bd65ae719e31ffa1bebba410af97f60d6d1a1691
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 29 11:29:24 2017 -0300
Bug 18999: (QA followup) ModReceiveOrder expects a hashref
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 2b343df13e6d154296cf968cb709aa910c58f336)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 388ced2e7472ccde5e8f3764d37d0d6c18480e34)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 79a54aa37e57966160581c0773efcf51e132815d
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Sat Jul 22 19:19:44 2017 +0000
Bug 18999: Modified SQL query in GetBudgetSpent() in C4/Budgets.pm
Removed the SQL select condition 'AND closedate IS NOT NULL' because
this was not returning shippingcost values and it does not exist in the
SQL query to return the shipping cost in spent.pl
Also removed the retrieval of shipping cost and the associated addition
of item(s) cost and shipping cost in GetBudgetOrdered() in C4/Budgets.pm
to prevent the shipping costs being subtracted off the fund total twice
Test plan:
1. Go to Acquisition and create a currency, budget (make this value of
100), fund ( make this the value of 50), vendor (if
neccessary)
2. Create a basket and click 'Add to basket'
3. Add 2 items with the vendor price of 10
4. Click 'Receive shipment' and write in the shipment cost of 6
5. Click 'Finish receiving' and go back to Acquisitions
6. Notice the spent column value is 0.00 but if you click on the value then
the spent.pl page is displayed and shows that the shipment cost was 6.00
7. On the acquisition page also notice that the ordered column value is 26.00
8. Click on the name of the fund and notice the spent column value is
0.00 in the fund page table
9. Apply patch
10. Refresh acquisition page and notice that 6.00 is the value in the
Spent column and 20.00 is the value in the ordered column. Both of which
match the subtotal of the full-list tables displayed when you click on these
values
11. Also notice the spent value in the fund page table is 6.00
12 Observe the changes to GetBudgetSpent() and GetBudgetOrdered() C4/Budgets.pm and check they make sense
Sponsored-by: Catalyst IT
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit caef98c7f64e02bba996c4da4f862bb55a86171a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 19b3041fb8bee95c320a909afd45f57b707ff2c2)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit dc7a7958f56980b5bad54c6a49182f2870a8d5bc
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Sat Sep 16 07:52:25 2017 +0000
Bug 18999: (QA followup) Minor fixes for tests
Removed unneccessary declaration of $budget and changed
Koha::Acquisition::Order->new->insert into
Koha::Acquisition::Order->new->store as requested in tester feedback
Test plan:
1. Go into your koha-shell
2. set the PERL5LIB variable
3. Run t/db_dependent/Budgets.t
All tests should pass
Sponsored-by: Catalyst IT
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 90c5391b349a339b3f1fea1ebfeb044cfa76c8a6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 8250e0f69a069ae2a43f52135e0a6d4daf259dfc)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1cf8f511153d959b46e69cb7bc1f0f7bea5d2242
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Fri Aug 18 15:16:55 2017 +0000
Bug 18999: Add regression tests
Added regression test for GetBudgetSpent() and GetBudgetOrdered() into
the t/db_dependent/Budgets.t
Test plan:
1. Go into your koha-shell
2. set the PERL5LIB variable
3. Run t/db_dependent/Budgets.t
All tests should pass
Sponsored-by: Catalyst IT
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 776692f31167f32c1621168249a9ebfea2accc96)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 2df9a4c0e0793065ce6787d683a68bef72075ff6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 4481acb5d7ce8089a0c7b45298f9419f8910b327
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jul 20 14:28:20 2017 -0400
Bug 19135: Restore AllowHoldsOnPatronsPossessions behaviour
Bug caused by
commit bc39f0392bbebaad4c083f81308f652a325be042
Bug 14695 - Add ability to place multiple item holds on a given record per patron
Test Plan:
1) Set AllowHoldsOnPatronsPossessions to "Don't"
2) Check out an item to a patron
3) Place a hold on that item for the same patron
4) Note you are allowed to with no alert
5) Delete the hold
6) Apply this patch
7) Place a hold on that item for the same patron
8) Note you recieve an alert now
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
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 46ff8df19544e3e7c16a4e3f21b3b14bc043dd88)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 4d22af870d1051d963cab31169a7f536864e56b0)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a26aacbc4e07e8fcc7a170a654a81979defecc0b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Oct 5 10:41:33 2017 +0200
Bug 19415: FindDuplicateAuthority is searching on biblioserver since 16.05
Commit b4392018bc1f9bf6a2f7dfe70b488856ad3a3897 [Bug 12478: make things using SimpleSearch use the new version] changed sub FindDuplicateAuthority and replaced this call (from 3.22.x) in 16.05 (pushed April 2016):
my ($error, $results, $total_hits) = C4::Search::SimpleSearch( $query, 0, 1, [ "authorityserver" ] );
The new call does unfortunately not include the authorityserver:
my ($error, $results, $total_hits) = $searcher->simple_search_compat( $query, 0, 1 );
Simple_search_compat redirects to C4/Search/SimpleSearch and SimpleSearch assumes a biblioserver if no server is passed.
This effectively makes FindDuplicateAuthority useless since we will no longer find duplicates and we could see an error like this in the log:
16:51:42-04/10 zebrasrv(51) [request] Search biblios ERROR 114 1 1+0 RPN @attrset Bib-1 @and @attr 1=authtype PERSO_NAME @attr 1=Heading Moerenhout
The fix is obviously trivial.
Test plan:
[1] Go to Authorities.
[2] Add a new authority PERSO_NAME with 100a Moerenhout.
[3] Repeat step 2. Verify that you get the duplicate authority warning.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 56500e8e676782155c5717e8db9786af394252d8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 2ffe76350ee6373dc27ba8ac098a468875c2f4fb)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 6fb761fbf7c4446a5e54c9d4fbd31e4b55e88189
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 16 15:12:07 2016 +0100
Bug 15173: Restore SubfieldsToAllowForRestrictedEditing
Bug 7673 introduced SubfieldsToAllowForRestrictedEditing but bug 12176
broke it assuming that only selects were impacted by this feature.
Test plan:
Go back on bug 7673 and confirm that
SubfieldsToAllowForRestrictedEditing is working as expected with this
patch applied.
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
For clarification, the item fields that are entered in
SubfieldsToAllowForRestrictedEditing should EXCLUDE the desired
fields you want to disable.
Test plan (updated to test the scenario in the bug Description):
1. Create a patron with only the following permissions:
- catalogue (Required for staff login)
- editcatalogue -> edit_catalogue
- editcatalogue -> edit_items
- editcatalogue -> edit_items_restricted
2. Navigate to Administration -> Global system preferences -> Cataloging
-> Record Structure -> SubfieldsToAllowForRestrictedEditing
3. In the input field for SubfieldsToAllowForRestrictedEditing enter in
all the 952 fields EXCEPT the ones desired to be disabled. In this
case, we want to disallow editing of 952$2, 952$a, 952$b, 952$e, 952$h,
and 952$o so we enter the following into the
SubfieldsToAllowForRestrictedEditing (without quotes) "952$0 952$1
952$3 952$4 952$5 952$7 952$8 952$c 952$d 952$f 952$g 952$i 952$j
952$p 952$t 952$u 952$v 952$w 952$x 952$y 952$z"
4. Click Save all Cataloging preferences
5. Login to the staff client as the created restricted editing patron
6. Edit an item
7. Note that all fields except for the ones excluded from the syspref
are editable
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit c84d03c582976cb590c62b25d59505b982a71d97)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit b7140dcd50a69396856cd5f66d9fcd74c579407d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5bf350c2de09218e7ffa83b93b968964c5987837
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Aug 30 04:36:50 2017 +0000
Bug 16204: Show friendly error message if trying to edit record which no longer exists
To test:
1) Create a record
2) Click Edit -> Edit record. open this in another tab
3) Delete the record in the original tab
4) Refresh the edit form in the other tab. Notice the software error
5) Apply patch and refresh page
6) There should be a nice error message with the form fields and buttons
hidden. Confirm links work as expected.
Sponsored-by: Catalyst IT
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 17c5b76597b9a356bc215a3682d7293e307fcc46)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 1766d21389a104948aba639921d987674cba3d6b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 77db31a583ecb6bcb86b0f44b8108c10efd46fc9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jun 8 16:01:32 2017 +0000
Bug 15644 - City dropdown default selection when modifying a patron matches only on city
This patch modifies the include files which contain the form fields for
city, state, zipcode, etc. shown on the patron entry screen. The files
are modified so that the city/state/zip <select> preselects a value
based on city, state, and zipcode matching the values in the
corresponding text fields.
To test, confirm that the bug's steps to reproduce are fixed:
- Enter two cities via Administration -> Patrons and circulation
-> Cities and towns:
Springfield, MA 01101
Springfield, VT 05156
- Edit a patron choosing, Springfield VT, and save.
- Edit the patron again and confirm that the correct city is
pre-selected.
- Confirm this result with all three different settings of the
"AddressFormat" system preference.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 83704cb1fab33feb0262fdab99bccf0052243d14)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 8cd8df19480a3765e54c3dcfb4948b097e7ea5ad)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit aec169578298e56bb41cf0534442231486187d5a
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Sep 1 16:07:36 2017 +0200
Bug 18742: (QA followup) Fix indentation
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 0ae70349809d51552e4297625db1382aa4e26dc5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit b3884ec092cd80268fa2f484ab95984d434f1c78)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5cd43029a2e1993e275be12227f86daaec746fb3
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jun 7 10:56:47 2017 -0400
Bug 18742: Circulation statistics wizard no longer exports the total row
To test:
- Run the circulation wizard
- Export to csv
- Note there is no total row
- Apply patch
- Export to csv
- Total row totally there!
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit ff22cb46a5f6a1f75422c2a90e1f80ccb05c30b9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 30811a653eb2f5e6ab089094bbb9936756aa9a16)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e2ee7118d0c97cb008b242b61a00a98f2c6e62c6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Sep 18 15:58:15 2017 -0300
Bug 19337: Make basic_workflow.t configurable through ENV
This patch makes the basic_workflow.t selenium tests read ENV for the
following vars:
KOHA_USER
KOHA_PASS
KOHA_INTRANET_URL
SELENIUM_ADDR
SELENIUM_PORT
to properly configure the running environment. If absent, all variables
fallback to current behaviour:
KOHA_USER // 'koha'
KOHA_PASS // 'koha'
KOHA_INTRANET_URL (unchanged)
SELENIUM_ADDR // 'localhost'
SELENIUM_PORT // 4444
[*] Selenium defaults are documented on the Selenium::Remote::Driver docs.
Prerequisites:
Make sure you have a working environment for the Selenium tests:
- Run:
$ sudo apt update
$ sudo apt install xvfb firefox-esr
To test:
- Run:
$ sudo koha-shell kohadev
k$ cd kohaclone
k$ wget https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar \
-O /tmp/selenium.jar
k$ SELENIUM_PATH=/tmp/selenium.jar
k$ Xvfb :1 -screen 0 1024x768x24 2>&1 >/dev/null &
k$ DISPLAY=:1 java -jar $SELENIUM_PATH &
k$ prove t/db_dependent/selenium/basic_workflow.t
=> SUCCESS: Tests pass
- Apply this patch
- Run:
k$ prove t/db_dependent/selenium/basic_workflow.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 5bb19808bb23a01a257a0970bd7e2ae43fb5b3d6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit f2b53042bd94ae4427ad08f5c55944974458ded4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ea2dd33e30af5e69c546f4330a892bebcdaf0cfd
Author: Dominic Pichette <dominic at inlibro.com>
Date: Tue Sep 12 10:13:58 2017 -0400
Bug 18584 - removed white space in C4/Accounts.pm
Test Plan:
1-go to C4/Accounts.pm
2-there should not be a trailing space at line 279.
Signed-off-by: Dominic Pichette <dominic at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 5400795a6651adc021801052fa0186747983b587)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d3f3512d3f480e3a7a36c3917e6748fef825d34f)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b7c622aef048d137eca9be6e30497c5c92d79c7e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 6 11:23:10 2017 -0300
Bug 12346: Display the correct number of pending patron modifications on the patron module home page
Due to the way members-home.pl handles the variable $branch, the number
of patron modifications listed on members-home.pl may differ from the
number listed on mainpage.pl. When the librarian clicks this link, he or
she may see a different number than was listed, or none at all!
Test Plan:
0) Set IndependentBranchesPatronModifications = Yes
1) Create a number of modification request for BranchA
2) Log into the staff intranet with a patron without superlibrarian
permissions and set your branch to BranchB
3) Note the modifications alert to does not display on mainpage.pl
4) Click the "Patrons" link to take you to members-home.pl
5) Note the modifictions alert does display on this page
6) Apply this patch
7) Reload members-home.pl, note the alert no longer displays
QA notes: What was the point of the branch variable?
Followed test plan, patch worked as described. Also passed QA test tool
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 4efe251f353cb9eddd302b6214e1f4392620b395)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 4f2dede23fe09d68f94276d8e26b58091c590c9e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c1d72e60df9ac1378ed7a8d0be903ab8be34c86a
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Oct 29 18:42:12 2017 +0100
Bug 18801: DBRev 16.11.13.001
commit 73213fbefc06dea7c98df3363a6a8ca6621a3e20
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 15 15:47:21 2017 +0200
Bug 18801: [Follow-up] Dbrev to repair bad auth type codes
Test plan
Run updatedatabase.
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 aa03981e79a10bd5a032f13533d93f0b87bd37f7)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit ed45e76bf928a5c929525b8f2795524ada217a1e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a19c652f8faeb9c3477fe5fc4f03eb33f525e494
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jun 14 09:19:10 2017 -0400
Bug 18801 - Merging authorities has an invalid 'Default' type in the merge framework selector
To test:
1 - Find two authorities and start a merge
2 - Leave the dropdown at 'Default'
3 - Merge records and note you get an error and can no longer view the
new record
4 - Check DB value of record authtypecode = 'Default'
5 - Apply patch
6 - Find two other authorities
7 - Merge leaving selector at default
8 - Success
9 - Check DB value of record authtypecode = ''
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 c1112236f908626b273f7dc950807ce2e085db2d)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit c7b47b3dfa689e8b746d188c648ad257feb678b6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2ce56249346ba9262ea81deab63eb10274345064
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 6 10:42:28 2017 -0300
Bug 19262: Remove xt/author/pod_spell.t
If you run `prove xt/author/pod_spell.t` without having Test::Spelling installed, it will skip the tests.
If you install the lib-test-spelling-perl, the test will fail:
xt/author/pod_spell.t .. You said to run 0 tests at xt/author/pod_spell.t line 21.
xt/author/pod_spell.t .. Dubious, test returned 25 (wstat 6400, 0x1900)
No subtests run
This is because the call to all_pod_files_spelling_ok is expecting a path
If we try to fix it with adding "." as parameter, the tests will raise tone of errors.
Let's remove this file
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 35e3de845c591958d66c6602940453f2a803a7ee)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d8e09eaec4b7bcbeb66a4e33fbe1adb2fc976fcf)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 2 +-
C4/AuthoritiesMarc.pm | 2 +-
C4/Budgets.pm | 12 +--
Koha.pm | 2 +-
Koha/QueryParser/Driver/PQF/query_plan/node.pm | 2 +-
acqui/basketheader.pl | 34 ++++----
cataloguing/addbiblio.pl | 10 ++-
cataloguing/additem.pl | 33 ++++----
installer/data/mysql/updatedatabase.pl | 17 ++++
.../en/includes/circ-patron-search-results.inc | 3 +-
.../en/includes/member-main-address-style-de.inc | 2 +-
.../en/includes/member-main-address-style-us.inc | 2 +-
.../prog/en/includes/prefs-admin-search.inc | 2 +-
.../prog/en/modules/admin/preferences.tt | 2 +
.../prog/en/modules/authorities/authorities.tt | 8 ++
.../prog/en/modules/authorities/merge.tt | 1 -
.../prog/en/modules/cataloguing/addbiblio.tt | 13 +++
.../prog/en/modules/cataloguing/additem.tt | 40 +++++++---
.../prog/en/modules/circ/circulation.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/js/cataloging.js | 16 ++--
.../bootstrap/en/modules/opac-discharge.tt | 7 +-
members/members-home.pl | 14 ++--
opac/opac-discharge.pl | 5 ++
opac/opac-password-recovery.pl | 1 +
reports/issues_stats.pl | 6 ++
reserve/request.pl | 3 +-
t/db_dependent/Budgets.t | 83 +++++++++++++++++++-
.../Circulation/NoIssuesChargeGuarantees.t | 1 +
t/db_dependent/DecreaseLoanHighHolds.t | 5 +-
t/db_dependent/SIP/Patron.t | 18 ++++-
t/db_dependent/Search.t | 2 +-
t/db_dependent/selenium/basic_workflow.t | 21 +++--
t/db_dependent/www/auth_values_input_www.t | 6 +-
xt/author/pod_spell.t | 22 ------
34 files changed, 282 insertions(+), 117 deletions(-)
delete mode 100644 xt/author/pod_spell.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list