[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.06-64-gf41f4bb
Git repo owner
gitmaster at git.koha-community.org
Sat Apr 22 01:23:08 CEST 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 f41f4bb90c8e6af6b86a6c56e6311e6cf69cbfad (commit)
via 73a57f5073c757da9f82cacd078526c784e50636 (commit)
via 01edde4d2f8dc524ac504185fdac0c5ad65d8f16 (commit)
via af8a39d73f0f716a486b6c5aa6972977a67d10cf (commit)
via 35c68e61b6e690e489f806c35af42be84232184f (commit)
via 7d286ab1021f8d403a99bbe92c8e46898bdbb2a0 (commit)
via 1485d09cbfbff8038216bce9029de517c25ad6d9 (commit)
via fe530a88cef5f83e295cb4897267d363f7137779 (commit)
via abc7ab14a2e878dcdd15d5431f367a886a4531e8 (commit)
via 7700f30f19ccff98448b8ea4a45a41f43fbd2180 (commit)
via 6ff2ff088f8d6bf16ceb1bff966a322ae782ba67 (commit)
via c3891904b3ad453b3ddb8ad12e40e486c0116075 (commit)
via 46b688991b86a66b3bfd66c894f5ced14519c36a (commit)
via fd4b3555d83c44e8026f3899faa879ba25c7a598 (commit)
via c8fbbecf789773bc6e4972361788499ab77470d8 (commit)
via af89b3be02b0184c5e0b6799ae880a074fff3813 (commit)
via fd742f664e3453def5005637110e9e3c2563b96c (commit)
via a852349be17183b56eea9bc8f3067b75fa778781 (commit)
via 77aaf0dabfc19fcc6569f1b730154823ada94b5f (commit)
via 302b66badafe5112f738ffd35f809b4b62e8fba5 (commit)
from 5a5af02be9eda69c77146184fe8392ca9c4067f3 (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 f41f4bb90c8e6af6b86a6c56e6311e6cf69cbfad
Author: Marc Véron <veron at veron.ch>
Date: Tue Apr 18 09:21:45 2017 +0200
Bug 18443: Get rid of warning 'uninitialized value $user' in C4/Auth.pm
When logging out from OPAC, plack-error.log log and/or opac-error.log
complain about 'uninitialized value $user' in C4/Auth.pm line 187. The
warning is not necessary, this patch removes it.
To test:
- try to trigger warning
- apply patch
- verify that warning no longer occurs
- prove t/db_dependent/Auth.t
- verifiy that SCO still behaves like before (especially if
you break out from sco path)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 7cbd9561271c1ac9ca3ccfd8ef257259a341f464)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 73a57f5073c757da9f82cacd078526c784e50636
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Apr 13 09:55:15 2017 -0400
Bug 18429 - Receiving an item should update the datelastseen
To test:
0 - Ensure AcqCreateItem is set to 'placing an order'
1 - Order some items, note entrydate and datelastseen match
2 - Alter those dates to be earlier than today (or wait some days)
3 - Recieve the item and note datelast seen not updated
4 - Apply patch
5 - Repeat 1-3
6 - Date last seen should be updated.
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Works as expected.
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 4cb7119e933009374fad8f192e1f30f819a74f88)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 01edde4d2f8dc524ac504185fdac0c5ad65d8f16
Author: Marc Véron <veron at veron.ch>
Date: Sun Mar 26 17:26:22 2017 +0200
Bug 18335 - Check in: Make patron info in hold messages obey syspref AddressFormat
When checking in, information about patrons with a hold always display
in an US style. Address information should opey the system preference
AddressFormat
To reproduce:
- Set syspref AddressFormat to German style
- Check out an item to a patron A
- Put a hold on this item for patron B
- Check in item using the Check in field in page header
- Result: In message 'Hold found', address does not display in German
style
To test:
- Apply patch
- Repeat steps above
- Verify that address displays as expected
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 8b0bed34c20b21865d76992b7822bc3874867cbc)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit af8a39d73f0f716a486b6c5aa6972977a67d10cf
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Apr 19 12:15:46 2017 -0300
Bug 18460: Fix undefined itemtype warning in Serials.t
This patch makes the test create an itemtype, and use it for the created item so there's no warning.
To test:
- Run:
$ prove t/db_dependent/Serials.t
=> FAIL: item-level_itypes set but no itemtype set... warning raised
- Apply the patch
- Run:
$ prove t/db_dependent/Serials.t
=> SUCCESS: Tests pass and no warning is raised
- Sign off :-D
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: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit eab4d43a479c20c3708eb0765c9e92ee6f58e7d9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 35c68e61b6e690e489f806c35af42be84232184f
Author: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Date: Tue Apr 1 14:07:59 2014 +0200
Bug 12021 - SIP2 checkin should alert on transfer and use CT for return branch
This small patch corrects the SIP2 checkin response if branch transfer is needed.
It depends on bug 7981 and also removes an obsolete alert check in SIP2.
Test plan:
- apply bug 7981
- make sure syspref AutomaticItemReturn is false
- check 'Return policy' in 'Default checkout, hold and return policy'
- make a SIP2 checkout and checkin from a branch different than item's home branch.
- verify that SIP2 response gives alert CV04 (=send to different branch)
- also verify that response field CT gives correct branch according to 'Return policy'
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Followed test plan, works as expected
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 37836951d38ed57c7ed5ed702aab1433729ffe0d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7d286ab1021f8d403a99bbe92c8e46898bdbb2a0
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 18 14:03:37 2017 -0400
Bug 18423 - Followup - enable Add child button for institutional borrowers
If they can have guarantors and we shwo the button on one page I think
we should in fact show it on all.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 185dc7f45af17bf70ec36125be736286a1f8b86e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1485d09cbfbff8038216bce9029de517c25ad6d9
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 18 13:53:54 2017 -0400
Bug 18423 - Add 'Add child' button to files, housebound, and deletemem pages
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b81a18ea39e1f360dc0dc4b7a874b614dc67d725)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit fe530a88cef5f83e295cb4897267d363f7137779
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Apr 17 12:32:56 2017 -0400
Bug 18423 Follow-up - Add 'Add child' button to statistics tab
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: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b689c6f9fe31dea49657b65af4f6830af1b17433)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit abc7ab14a2e878dcdd15d5431f367a886a4531e8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Apr 12 11:32:11 2017 -0400
Bug 18423 follow up - fix display off add child on members/notices.pl
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: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit d18f30eb3f794a144989970893ef87d673cef8ec)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7700f30f19ccff98448b8ea4a45a41f43fbd2180
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Apr 12 10:23:56 2017 -0400
Bug 18423 - Add child button not always appearing - problem in template variable
This patch removes the retrieval of the syspref borrowerRelationship
from the scripts and moves it to a check using the Template Toolkit
plugin
To test:
1 - Apply patch
2 - Ensure 'Add child' button displays appropriately on all member pages.
Tested 3 pateches together, works as expected.
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: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit e28f19f0a88e334c99a45fadf96ae504bbb17ebe)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 6ff2ff088f8d6bf16ceb1bff966a322ae782ba67
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Sun Jan 15 23:26:33 2017 -0500
Bug 17911: Message and timeout mismatch
The installation step 3 has a meta refresh of 10 seconds,
but the message says 5 seconds. People could get impatient.
TEST PLAN
---------
1) Fresh install
-- notice the discrepancy on the web installation.
2) drop and create the DB
3) apply the patch
4) run the web install
-- notice it refreshes faster (5 seconds vs 10 seconds)
5) run koha qa test tools
Works as intended and passes qa test tool
OK koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
OK forbidden patterns
OK git manipulation
OK spelling
OK tt_valid
OK valid_template
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 46d0be3114785c17e48df8bc31b515599d394789)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c3891904b3ad453b3ddb8ad12e40e486c0116075
Author: pongtawat <pongtawat at punsarn.asia>
Date: Mon Dec 26 17:50:50 2016 +0700
Bug 17814: koha-plack --stop should make sure that Plack really stop
koha-plack --stop doesn't ensure that Plack was really stopped before
returning
So in case that koha-plack --stop was quickly follows by koha-plack
--start (e.g. logrotate), it could leave Plack in stop state. This is
due to koha-plack --start think that Plack was already started, while it
actually is being stopped.
For me I think this is the cause why I got random Plack stop when
logrotate is run.
It should be similar to the case of Zebra in Bug #16885, and the
solution might be the same: adding "--retry=TERM/30/KILL/5;" to
start-stop-daemon command.
TEST PLAN
---------
1) Login to staff client and do something that will hold connection for
a long time, e.g. a batch import or a slow report.
2) sudo koha-plack --stop mykoha
3) ps aux | grep plack <-- a Plack process will still running work in
1)
4) wait for 1) to finish and all Plack processes exit
5) sudo koha-plack --start mykoha
6) apply the patch
7) repeat step 1)-2)
8) ps aux | grep plack <-- There should be no Plack process running
now
9) Note that work in step 1) might get terminated midway. Since we force
Plack to stop after some wait.
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: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit afb62d9a6c6cbb65b5149220c5c25bc29adf2d7e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 46b688991b86a66b3bfd66c894f5ced14519c36a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Apr 20 12:52:47 2017 +0200
Bug 18364: [Follow-up] Also add an environment variable to prevent locking
The test in SendCirculationAlert is extended by adding an env var
called KOHA_NO_TABLE_LOCKS. If this var is set to a true value,
the table locking is skipped too.
This is useful when running a test without prove. The variable could be
set in a shell profile.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit d51538cb824387230b3e2cab955d3c16475bedde)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit fd4b3555d83c44e8026f3899faa879ba25c7a598
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Mar 31 13:43:38 2017 -0300
Bug 18364: Do not LOCK/UNLOCK tables from tests
From the MySQL doc:
"LOCK TABLES is not transaction-safe and implicitly commits any active transaction before attempting to lock the tables."
If the LOCK/UNLOCK statements are executed from tests, the current transaction will be committed.
To avoid that we need to guess if this code is execute from testsa or not (yes it is a bit hacky)
Better ideas are welcome!
Another fix would have been to revert
commit be156d9ad9e5bcfadab34d44f90e04fd61e256ad
Bug 15854: Use a READ and WRITE LOCK on message_queue
but theorically a race is still possible.
Existing tests seem to be safe, to test this patch you will need new
tests from bug 17964.
Test plan:
prove t/db_dependent/Letters/TemplateToolkit.t
twice, and notice that changes have been comitted.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b40456f7dd4b8a988f9c6a5718452936101cb8ff)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c8fbbecf789773bc6e4972361788499ab77470d8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Apr 17 13:22:24 2017 -0400
Bug 18439 - Resend button for notices being hidden by CSS and never unhidden
Current jQuery is not unhiding resend button, this patch adds an id
and a toggle command
To test:
1 - Enable EnhancedMessagingPreferences
2 - Find a patron with sent or failed messages
3 - Note you can expand message, but not resend
4 - Apply patch
5 - Note that on expanding message a 'Resend' button appears
6 - Ensure resend button operates as expected
Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Lari Taskula <lari.taskula at jns.fi>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ea04798a16ad8c8400030440e21825fc20b03808)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit af89b3be02b0184c5e0b6799ae880a074fff3813
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jan 26 14:31:35 2017 +0000
Bug 18001 - LocalHoldsPriority can cause multiple holds queue lines for same hold request
If LocalHoldsPriority is enabled, and a record level request has more
than one item that could fill that hold, there is a possibility that a
holds queue row will be generated for the request for each of the
available items!
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Joel Sasse <jsasse at plumcreeklibrary.net>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 2a8f748f25e305deca7fce41451fbd78056ba26d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit fd742f664e3453def5005637110e9e3c2563b96c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Apr 18 07:38:42 2017 -0400
Bug 18001 - Unit Test
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit aa68e40005928150ac4aa1db8ce00716d7b7fe3f)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a852349be17183b56eea9bc8f3067b75fa778781
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Apr 11 16:45:40 2017 +0000
Bug 18372 - transits are not created at check in despite user responsing Yes to the prompt
If the AutomaticItemReturn system preference is set to "Don't" and you
check in an item which belongs to another library, a dialog will ask you
if you want to transfer. This patch corrects a bug to enable the "Yes"
buttons to work, triggering the transfer.
To test, apply the patch and check in an item which belongs to another
library. In the dialog, click the 'Yes' button and confirm that the item
has been made 'in transit' to the correct library.
Perform the same test with the 'Yes, print slip' and 'No' buttons and
confirm they are working correctly.
Since this patch changes the behavior of many other popups triggered
from this template, test other operations which trigger a 'print slip'
option like:
- Checking in an item which is part of a rotating collection
- Checking in an item which is on hold for a patron
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 07156cf8fd0f11eb43a11ffa7f75d4c95f3766df)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 77aaf0dabfc19fcc6569f1b730154823ada94b5f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Mar 31 00:24:09 2017 -0300
Bug 18321: Correctly calculate switch_onsite_checkout
Silly error here, the $switch_onsite_checkout is not correctly
calculated, it should not only be set to the value of the syspref, but
meet all the conditions.
Test plan:
Set a circ rule with number of on-site checkout = 2 and number of
checkouts = 2.
Switch on both ConsiderOnSiteCheckoutsAsNormalCheckouts and SwitchOnSiteCheckouts
Do a regular checkout
Do another regular checkout
At this point you have reach the maximum number of checkouts allowed.
Not try another one.
=> Without this patch you will not get the warning
=> With this patch you will see it
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit f04c5d5a2c549bed54036b726965ccda083def7b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 302b66badafe5112f738ffd35f809b4b62e8fba5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Mar 31 00:23:19 2017 -0300
Bug 18321: Add tests
Clean a bit existing tests by adding default values and add a test to
highlight the issue.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 1c7d283aae0952877b871f486c31cd3f04529222)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 2 +-
C4/Circulation.pm | 19 ++++---
C4/HoldsQueue.pm | 7 ++-
C4/SIP/ILS/Transaction/Checkin.pm | 8 +--
C4/SIP/Sip/MsgType.pm | 8 ---
acqui/finishreceive.pl | 1 +
circ/circulation.pl | 1 -
circ/returns.pl | 28 ++++++-----
debian/scripts/koha-plack | 2 +-
.../prog/en/includes/members-toolbar.inc | 4 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 52 ++++++++------------
.../prog/en/modules/installer/step3.tt | 2 +-
.../prog/en/modules/members/notices.tt | 3 +-
members/boraccount.pl | 3 +-
members/deletemem.pl | 3 +-
members/files.pl | 1 +
members/housebound.pl | 1 +
members/mancredit.pl | 3 +-
members/maninvoice.pl | 3 +-
members/member-flags.pl | 3 +-
members/member-password.pl | 3 +-
members/moremember.pl | 1 -
members/notices.pl | 3 +-
members/pay.pl | 3 +-
members/paycollect.pl | 3 +-
members/printfeercpt.pl | 2 +-
members/printinvoice.pl | 2 +-
members/readingrec.pl | 4 +-
members/routing-lists.pl | 2 +-
members/statistics.pl | 2 +
t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 25 +++++++++-
t/db_dependent/HoldsQueue.t | 36 +++++++++++++-
t/db_dependent/Serials.t | 27 ++++++++--
33 files changed, 169 insertions(+), 98 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list