[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.12-67-g319369c
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 6 08:25:00 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 319369ccc2b4c7e356cf2d24b9571b6365e4ccb8 (commit)
via 762fdf3e3c2de3a71fcca9b514ad0f0dd9d59fed (commit)
via d708f5726658367212e96cd5de542d7658c7eae9 (commit)
via 82db13b7116a202a3bc9baf81f198ef9a227b85e (commit)
via ecc6542c8c205228dd771388c72fac161c89fc2d (commit)
via 0e5ae1af5de6423c99daa77b31bbe309159ccd62 (commit)
via 3e38feb58a07e5e60fdde726fe90199958bbc653 (commit)
via bd2602adacce6ff8caf448abc62947e4e25f3728 (commit)
via 3435f41c3a3df02c000a888185ad384124c39e1d (commit)
via d790db9032ca2db8600eeeca34900e13620e722d (commit)
via 6042f0aa4d1dd567a3c65d58eb5b2dbd4d8225cb (commit)
via 5fd46da8061a49f3f1da4a8582492cd3e4ec5ee3 (commit)
via 5393b2455260b6e34602272d1ff7a1a17b5e6968 (commit)
via b2b16f3820d9d2e4ef26a2b5c4dc4e551fbad576 (commit)
via 12188c983477479372f8905bfc0372ca744092ca (commit)
via 9355a1a00562659efeddae0b550cc24f06568bc5 (commit)
via b8baced52c1f5bc7c8781f4ce96e7a3a2ab6b4c4 (commit)
via 35bde143cf882728381e16c42ed572dc1bf29a5b (commit)
via 6473754f54f401a29a8b2e5256cce2225065cb3f (commit)
via 3f7c40b7eb5b62731a1e3b9a85bbdfcbe0ffc435 (commit)
via c03a9a2d8c5715ffa24681d8dfb836f128a2b404 (commit)
via e9a48b2ec7b5c3dda65f7eaa5182a46b0082e2b4 (commit)
via 98d9ef0b65805e8455abe2353984439c9d5f8584 (commit)
via 2b82ff17ee6273a9dabec230a1fb4ccec82734a2 (commit)
via 255cf73ae9334698e226fd0ab392cd8a140fcc70 (commit)
via 7d448f66848efbc342609399371ea522662e11d0 (commit)
via 771f433b60965fed7eb9f1c3501f4b1308e059cc (commit)
via 263f8ec935ce8dfa8cf5d1c915a037084c952b1d (commit)
via 0c9717bcfca462d180f3309c7b743e167da7cd2b (commit)
via 05a96c084f75a75544f817dc78a8d073b4244102 (commit)
via 400f2ea196140e78202f714c8712f93f46452665 (commit)
via 368dfc081576914927b202b1624d558f46dcc7e5 (commit)
via eb638bdc977ebfe7f9b13e22593109388dcffa9c (commit)
via b975b971b4609fa005e69fb11832f560b748156a (commit)
from 96fa3f51e142a6ef0538aa84e5134a56aa7af750 (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 319369ccc2b4c7e356cf2d24b9571b6365e4ccb8
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Oct 2 22:00:57 2017 -0400
Bug 18897: Add skipping to t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
Test Plan:
$ git fetch
$ git checkout -b bug_18897 origin/master
$ sudo apt-get remove libcatmandu-store-elasticsearch-perl
$ prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
-- nasty failure.
$ git bz apply 18897
-- apply all the patches
$ prove t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
-- nicer skip message
run the koha qa test tools
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 2b4d0cb0b4e16b008ad9928a09259accfa1efc7a)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 762fdf3e3c2de3a71fcca9b514ad0f0dd9d59fed
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Oct 2 21:50:01 2017 -0400
Bug 18897: Skipping t/db_dependend/00-strict elastic search stuffs as needed
Test Plan:
$ git fetch
$ git checkout -b bug_18897 origin/master
$ sudo apt-get remove libcatmandu-store-elasticsearch-perl
$ prove t/db_dependent/00-strict.t
-- nasty failure.
$ git bz apply 18897
-- interactive apply just the four patchs
$ prove t/db_dependent/00-strict.t
-- nicer skip message
run the koha qa test tools
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit faf651e514a1d2f5fa84df0c64556cc9962afc99)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit d708f5726658367212e96cd5de542d7658c7eae9
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Sep 1 14:15:44 2017 -0400
Bug 18897: Use Module::Load::Conditional::can_load
Rather than rely on eval(), Jonathan Druart recommended in
comment #6 to use Use Module::Load::Conditional::can_load.
This addresses that concern.
TEST PLAN
---------
$ git fetch
$ git checkout -b bug_18897 origin/master
$ git bz apply 18897
$ sudo apt-get remove libcatmandu-store-elasticsearch-perl
...
$ prove t/db_dependent/Koha_Elasticsearch_Indexer.t
-- Note that the message says the correct library is missing.
$ sudo apt-get install libcatmandu-store-elasticsearch-perl
-- Note it runs as expected.
run the koha qa test tools
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 088e332760b55c6f7a44097d8ab5d84003d8f0e0)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 82db13b7116a202a3bc9baf81f198ef9a227b85e
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Aug 25 07:38:06 2017 -0400
Bug 18897: Improve error message
Test Plan:
$ git fetch
$ git checkout -b bug_18897 origin/master
$ git bz apply 18897
-- interactive apply just the first patch
$ sudo apt-get remove libcatmandu-store-elasticsearch-perl
...
$ prove t/db_dependent/Koha_Elasticsearch_Indexer.t
-- Note that the message says the wrong library is missing.
$ git bz apply 18897
-- interactive apply this patch
$ prove t/db_dependent/Koha_Elasticsearch_Indexer.t
-- Note that the message says the correct library is missing.
run the koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit a24ac206701bdde509baf47f005aa31bf42a1b6a)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ecc6542c8c205228dd771388c72fac161c89fc2d
Author: Lee Jamison <ldjamison at marywood.edu>
Date: Fri Aug 25 07:18:15 2017 -0400
Bug 18897: Koha_Elasticsearch_Indexer.t doesn't skip when ES module(s) not installed
If Catmandu::Importer::MARC is not installed,
Koha_Elasticsearch_Indexer.t fails instead of skipping.
It should skip as ES is not currently mandatory.
Test Plan:
1. Run "prove t/db_dependent/Koha_Elasticsearch_Indexer.t"
as koha-shell
2. Note failure on test 1/5 indicating module not installed.
3. Apply patch.
4. Re-run "prove t/db_dependent/Koha_Elasticsearch_Indexer.t"
5. Note test now skips.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit b6b6acf285f98a7da665eac6741cdfc87b089b57)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 0e5ae1af5de6423c99daa77b31bbe309159ccd62
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 28 14:49:11 2017 -0300
Bug 19385: Fix random t/Calendar.t failure - clear the cache before
The cache 'exception_holidays' may be populated when we run these tests,
we need to clear it before the tests are run.
Test plan:
prove t/db_dependent/Circulation/CalcDateDue.t t/Calendar.t
Without this patch, t/Calendar will fail with:
# Failed test 'Exception holiday is not a closed day test'
# at t/Calendar.t line 159.
# got: '1'
# expected: '0'
# Looks like you failed 1 test of 38.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit ae86b7ca9ea60bba47d3a999ff13d6140cdc5e1c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 02d518b334596ed585596c614ab31c0656901634)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3e38feb58a07e5e60fdde726fe90199958bbc653
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Aug 28 08:51:24 2017 +0200
Bug 19004: [QA Follow-up] No need to check item-level_itypes again
As Jonathan pointed out, GetItem already called effective_itemtype.
So we can just use $item->{itype} here.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
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 0e744d49b557e3401ae7b700b1410b022a4e851c)
(cherry picked from commit ad718868553f149d0e9ea9ec7b7718677bac6c5e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit bd2602adacce6ff8caf448abc62947e4e25f3728
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Aug 9 16:30:03 2017 +0200
Bug 19004: Adjust AddReturn for retrieving item type
In the regular situation, you can get itemtype via biblio and then
biblioitem as well as via biblioitem (at least when item-level_itypes
is set to biblio).
But since Koha unfortunately defined two relations in item, one for
biblioitemnumber (the good one) and one for biblionumber (redundant),
TestBuilder (correctly) builds one biblioitem and two biblios.
If you item-level_itypes to biblio record, this will result in failing tests
when calling AddReturn (in this case Koha/Patrons.t).
It will crash on:
Can't call method "itemtype" on an undefined value at C4/Circulation.pm line 1826.
Cause: AddReturn goes via the biblionumber to biblio and than to
biblioitems, and it does not find a biblioitem. (Not a fault from TestBuilder
but a database design problem.)
This patch makes a small change in AddReturn to retrieve the itemtype via
biblioitem. It actually is a shorter road than items->biblio->biblioitems.
Note: I do not test the Biblioitems->find call, since we already checked
the GetItem call before and we have a foreign key constraint.
I did not call $item->effective_itemtype since we still use GetItem; this
could be done later.
Adjusted Circulation/Returns.t too: If we add an item with TestBuilder and
we called AddBiblio before, we should link biblioitemnumber as well.
Test plan:
[1] Do not apply this patch yet.
[2] Set item-level_itypes to biblio record.
[3] Run t/db_dependent/Koha/Patrons.t. (It should fail.)
[4] Apply this patch.
[5] Run t/db_dependent/Koha/Patrons.t again.
[6] Run t/db_dependent/Circulation/Returns.t
[7] Git grep on AddReturn and run a few other tests calling it.
Note: Bugs 19070/19071 address three tests that call AddReturn too.
[8] In the interface, check in a book.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Note: Bugs 19070 and 19071 are already pushed. The command in comment #4
has all the tests successful.
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 0fc3f19605d3979333dc333237205b9bef6ab60b)
(cherry picked from commit fba32956691ec0b3295e75aa8554d1454cb29819)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3435f41c3a3df02c000a888185ad384124c39e1d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sun Jul 30 16:53:00 2017 +0200
Bug 19004: Patrons.t should create its own data for enrollment fees.
If the patron categories J, K, YA would not exist, Patrons.t would fail.
Test plan:
[1] Remove one of these patron categories.
[2] Run t/db_dependent/Koha/Patrons.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 57427f7a10c887964fa4d4397c6ec238af2bc694)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 2fdd3ef94a424d956fd6032662e6a69ddb81e511)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit d790db9032ca2db8600eeeca34900e13620e722d
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Aug 19 10:22:44 2017 +0200
Bug 14316: Clarify meaning of record number in Batch record modification tool
Same change as the first patch, but for the batch record
modification tool.
Signed-off-by: Marc Véron <veron at veron.ch>
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 327495b5e0ec4de47d20bd27d6a1c5b88e0be191)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 3352a6ee9e7526e228f66ea420fd99709a601f82)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 6042f0aa4d1dd567a3c65d58eb5b2dbd4d8225cb
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jun 8 02:03:34 2015 +0200
Bug 14316: Clarify meaning of record number in Batch record deletion tool
Changes the label from 'list of record numbers...' to
'List of biblionumbers or authority ids...' to make it
more clear to the user which kind of input is expected.
To test:
- Go to Tools > Batch record deletion
- Check the new description
- Decide if it's more clear or not
Signed-off-by: Marc Veron <veron at veron.ch>
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 4934ee4a1601bd268a7153b7189387bb073dd11f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 9f07f1493f9f44c7a7b691c79bf9215a76758670)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5fd46da8061a49f3f1da4a8582492cd3e4ec5ee3
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Sep 1 08:41:51 2017 -0400
Bug 18946 [QA Followup] - code cleanup
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 f1b0dae9a6055e8ba5e9a9638af32060c1e17e33)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 936ee4a1cf9dda6a5d8c1753c40b73b9720ed0bb)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5393b2455260b6e34602272d1ff7a1a17b5e6968
Author: Karam Qubsi <karamqubsi at gmail.com>
Date: Wed Jul 19 00:06:48 2017 +0800
Bug 18946 - Change language from external web fails
How to reproduce:
1. Get a multilingüal Koha like
http://demo1.orex.es/cgi-bin/koha/opac-changelanguage.pl?language=en
http://demo1.orex.es/cgi-bin/koha/opac-changelanguage.pl?language=es-ES
2. Copy that urls to any web page in an other domain -it must be in some
host - and try to link to the spanish or english version,it will keep you in the same position.
3. Apply this patch and try again , everything should work fine .
Signed-off-by: Hugo Agud <hagud at orex.es>
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 48f54016a7accfc0cc43bf01cbac70a8482bc3f9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 73f0c231bbd1c8a0b1d7c22d0a2fcb49a4811863)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b2b16f3820d9d2e4ef26a2b5c4dc4e551fbad576
Author: Lari Taskula <lari.taskula at jns.fi>
Date: Wed May 31 17:03:54 2017 +0300
Bug 18692 - intranet part
Fixes misplaced columns introduced by previous patch and adds the "-" for phone
transport type.
To test:
1. Set SMSSendDriver system preference on
2. Go to intranet messaging preferences
3. By default you should see checkboxes for all messages for SMS
4. Ensure columns are not misplaced (pushing one column too much to the right)
5. Delete sms method from one of the messages in message_transports table
6. Observe that "-" is displayed instead of checkbox for that message for SMS
7. Repeat same for TalkingTechItivaPhoneNotification system preference.
By default it may not have transports in message_transports, so make sure
to assign some in order to have the checkboxes visible.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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 bb31d99065c468fbec2443cd15894b03657a24d5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit c618b787bf98e6b9c8004694cfd066e936760191)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 12188c983477479372f8905bfc0372ca744092ca
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Jun 1 17:22:42 2017 +0200
Bug 18692 - same with syspref TalkingTechItivaPhone
Fixes misplaced columns introduced by previous patch and adds the "-" for phone
transport type.
To test:
1. Set SMSSendDriver system preference on
2. Go to intra and OPAC messaging preferences
3. By default you should see checkboxes for all messages for SMS
4. Ensure columns are not misplaced (pushing one column too much to the right)
5. Delete sms method from one of the messages in message_transports table
6. Observe that "-" is displayed instead of checkbox for that message for SMS
7. Repeat same for TalkingTechItivaPhoneNotification system preference.
By default it may not have transports in message_transports, so make sure
to assign some in order to have the checkboxes visible.
https://bugs.koha-community.org/show_bug.cgi?id=8692
Signed-off-by: Michael Andrew Cabus <michael at bywatersolutons.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 8fd0847c82adbcaf0af3285dd9cfc5e646ba6500)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 667a907aa73ab210ee05bc9ef73f8ab3bedbe6bf)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9355a1a00562659efeddae0b550cc24f06568bc5
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Mon May 29 16:32:18 2017 +0200
Bug 18692 - When SMS is enabled the OPAC messaging table is misaligned
Bug 6726 had corrected the fact that when SMS is enabled the messaging table is missing a column.
Bug 6458 has broken this.
The SMS column is missing an else case with cell containing only "-" like other columns.
Test plan :
- set SMSSendDriver preference empty
- go to OPAC patron messaging
- column SMS should not be visible
- set SMSSendDriver preference not empty
- go to OPAC patron messaging
- column SMS appears with checkboxes
Signed-off-by: Michael Andrew Cabus <michael at bywatersolutons.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 a932d05ace6500a3b67888aad1306e58cfa8014f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit c5c174e834cad2110f45eec90b80441f2f4ec0f4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b8baced52c1f5bc7c8781f4ce96e7a3a2ab6b4c4
Author: Marc Véron <veron at veron.ch>
Date: Wed Aug 9 09:46:02 2017 +0200
Bug 18636: Sysprefs: Add explanation for conflict autonumbernum / BorrowerMandatoryFields
This patch adds a note to the system preferences autonembernum and
BorrowerMandatoryFields regarding a conflict if automembernum is on
and BorrowerMandatoryFields contains cardnumber.
To reproduce issue: See initial comment.
To test:
- Apply patch
- Verify that in system preferences note appears with both prefs
automembernum and BorrowerMandatoryFields
Followed test plan, works as described
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
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 65bce82b1fb32d3d98fe4d4ef1e1738a97749632)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 07695e8de40c55f2837ae81b5e35b8e11656f272)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 35bde143cf882728381e16c42ed572dc1bf29a5b
Author: Marc Véron <veron at veron.ch>
Date: Tue Jun 27 18:50:44 2017 +0200
Bug 16485: collection column in Item search is always empty
This patch fills the column 'Collection' in item search from the item values.
To test:
- Go to item search
- Reproduce issue from initial comment
- Apply patch
- Verify that the column 'Collection' is filled
Still to do, but outside of my datatable skills:
Filter by drop down in the column header does a substring search.
Example: Filter for 'Fiction" returns both 'Fiction' and 'Non-fiction' items.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Laurence Rault <laurence.rault 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 6c1504cfdb301cb0f9f3a14b5db31a63f5c3b0a5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 74752502b309ddec4311a4311a3481bf54061187)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 6473754f54f401a29a8b2e5256cce2225065cb3f
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Wed Aug 2 17:12:44 2017 +0100
Bug 19024 Do not unset order cancelled status on basket close
On closing a basket, status is updated to ordered for orders not
completed. However the operation was resetting the status for
cancelled as well as new orders.
While display is correct from the basket view (it checks the
cancellation date). The status in the acquisitions tab from the
catalogue view reverts erroneously to ordered.
This patch adds cancelled to the statuses not updated on basket
close.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 2e9165001f69312255ad1b6706f040784460d5d1)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 0679425b29b9bff8c16fff91b7351a2f9f89a045)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3f7c40b7eb5b62731a1e3b9a85bbdfcbe0ffc435
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Aug 15 11:44:12 2017 +0100
Bug 19024 Fix some infelicities of phrasing in test messages
The test messages were awkwardly phrased, re phrase them to
sound more natuaral. Patch is cosmetic (grammar) only
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 16c25a36988b47fb9fcbabd91fdace5f98f9caed)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 68cd7787717a5831ed276fce65cc2845368a7c41)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c03a9a2d8c5715ffa24681d8dfb836f128a2b404
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 9 16:09:32 2017 -0300
Bug 19024: Add tests
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 7db6067dc4cc55bee771fedb31e2454b72123ac0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 342786ec9acbebe2aa85481d9f0f273dea8219ad)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e9a48b2ec7b5c3dda65f7eaa5182a46b0082e2b4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 1 16:20:18 2017 -0300
Bug 9857: Fix failing tests
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 49778103ce528ccfc7fcc8be26bcae3b4ae7815b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 66c568941bba29efc739f83dc3fb2cfb172d02ea)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 98d9ef0b65805e8455abe2353984439c9d5f8584
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Aug 18 08:36:59 2017 +0000
Bug 9857 - Follow-up - Fix for searches with su= or su:
When the initial search is su=.../su:... the links was
not constructed correctly. With this change, it should
be the case.
Signed-off-by: Josef Moravec <josef.moravec at gmail.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 786deba62beb5a52a543af5415610e14f7d0a8c5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 112116e45f4676aea3a63faa42b0e6a3e2456706)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2b82ff17ee6273a9dabec230a1fb4ccec82734a2
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Fri Dec 4 01:17:50 2015 +0100
Bug 9857: Did you mean? uses wrong punctuation in search links
The link changes the search links generated by the plugins
from an=authid to an:authid, as suggested by Jared on the
bug report.
- Turn on the AuthorityFile und ExplodedTerms plugins
for the OPAC from the "Did you mean" section of the
administration module
- Search a term in your OPAC where one or several
authorities exist.
A last name or a place name might work well.
- Verify that there are suggestions displayed on top of
your result list.
- Verify that the link created is something like:
/cgi-bin/koha/opac-search.pl?q=an=14084
- Apply patch.
- Verify the link has changed a little and still works
correctly:
/cgi-bin/koha/opac-search.pl?q=an:14084
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.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 d0e3891e251a6a11188d70a5480af0e44b8c1fb0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 49d8426f5634aa6433f58ce5830d9f7729605364)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 255cf73ae9334698e226fd0ab392cd8a140fcc70
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Wed Jul 12 10:09:48 2017 +1200
Bug 18621: Added in value attribute to dateexpiry field
Test plan:
1. Create a patron category with the dateexpiry value of 29/9/2017
2. Create a patron user from that patron category (which I'll refer to as patron A) with the date
expiry value of 1/10/2017 and submit the form
3. Notice that the manual dateexpiry you have submitted is correctly
displayed
4. Create a duplicate patron with the same firstname and surname and
patron A, and set the date expiry value of 1/10/2017 and submit the form
5. The form displays a duplicate patron message. Notice that the dateexpiry input box is empty now
6. Select the new member (not a duplicate member) option in the
messagebox
7. The form successfully submits and notice that the date expiry value
displayed is that of the patron category (i.e. it is 29/9/2017) not the
dateexpiry value of 1/10/2017 that you manually set for this patron
8. Apply patch
9. Repeat step 4
10. The form displays a duplicate patron message. Notice the dateexpiry input box still
contains the value you entered which is 1/10/2017. Select the new member
(not a duplicate member) option in the messagebox
11. The form successfully submits and notice that the date expiry value
displayed is 1/10/2017 that you manually set for this patron
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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 515e62992893b72c54a34311088a9442a37d8138)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 60b6d736ee306198af83e1a1482ff89280a05e7b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7d448f66848efbc342609399371ea522662e11d0
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jun 15 11:07:03 2017 -0400
Bug 18812 - SIP Patron status does not respect OverduesBlockCirc
To test:
1 - Set 'OverduesBlockCirc' to block
2 - Find or create a patron with overdues
3 - Perform a SIP patron lookup on that patron
misc/sip_cli_emulator.pl -a 127.0.0.1 -p 6001 -su term1 -sp term1 -l CPL
--patron {userid or cardnumber} --password {pass} -m patron_information
4 - Note the first character of response is a ' '
5 - Apply patch
6 - Restart memcached, apache, and plack
7 - Perform SIP patron lookup
8 - Note the first character of response is 'Y'
9 - prove t/db_dependent/SIP/Patron.t
10 - Test should return green
Signed-off-by: Chris Kirby <chris.kirby at ilsleypubliclibrary.org>
Works as advertised
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 ff4f0858950c37eeede38b2f067841602b97d7ba)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 4b360f1371a56268458b62e5c8c68da853b4e52d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 771f433b60965fed7eb9f1c3501f4b1308e059cc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 7 17:25:15 2017 -0300
Bug 19055: Remove C4::Reserves::GetReservesToBranch
This subroutine is no longer in used and can be removed
Test plan:
git grep GetReservesToBranch
must not return any results
Signed-off-by: Marc Véron <veron at veron.ch>
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 9cc7268362219e39b22aebb03a83e013f467d93a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 319f5f67aaa056952ecc9a4500fa52627db4fdcc)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 263f8ec935ce8dfa8cf5d1c915a037084c952b1d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jul 31 09:18:15 2017 -0400
Bug 19007 - Allow paypal payments via debit or credit card again
A recent change in Paypal has removed the previous default option of paying via debit or credit card without an account. To bring this option back, we need to send an additional parameter to the PayPal API.
Test Plan:
1) Enable paypal for your Koha instance
2) Ensure you are not logged in to PayPal
3) Attempt to pay a fine via PayPal
4) Not the the "Pay with Debit or Credit Card" option is missing
5) Apply this patch
6) Refresh opac-account.pl
7) Attempt to make a payment via PayPal again
8) Note the option "Pay with Debit or Credit Card" is now available
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: George Williams <gwilliams at nekls.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 10311769d460a775aa8c8ee8a190836a8f2b1f1e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 5a132e1c3fb19d232b51e7ae68e468ddf81c6d8b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 0c9717bcfca462d180f3309c7b743e167da7cd2b
Author: Marc Véron <veron at veron.ch>
Date: Sat Feb 18 18:35:39 2017 +0100
Bug 14353 - Show 'damaged' and other status on the 'place holds' page in staff
This patch adds status 'Damaged' to 'Information' 'Status' in the items
table on 'Place hold' page.
To test:
- Apply patch
- In staff client, try to place an item level hold for items with 'Damaged'
status.
- Verify that the status 'Damaged' appears in the column 'Information'.
Signed-off-by: Owen Leonard <oleonard at myacpl.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 8d08254b2202353517c16f34172cb92dcdd5befa)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 58d775dda10f5191301a80a2b5c0b4a135213e5a)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 05a96c084f75a75544f817dc78a8d073b4244102
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Feb 26 14:46:45 2016 +0000
Bug 15924 - Coce not enabled on lists
To test:
Enable Coce and disable other image services
Load a list and not there are no covers
Apply patch
Load a list and note there are covers
https://bugs.koha-community.org/show_bug.cgi?id=15924
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.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 85b963d11fb5d8674ca6b0ec60821663f9d8cf19)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 669b6839eab456f36ed7c65a7a97fa7b386ab4e6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 400f2ea196140e78202f714c8712f93f46452665
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 18 14:23:54 2017 -0300
Bug 19335: Fix 00-merge-conflict-markers.t when dockerised
This does not make sense, but fix a bug (why?)
Without this patch, the tests failed on po files:
[17:14:26] t/00-merge-conflict-markers.t .. Failed 1/1 subtests
Test Summary Report
-------------------
t/00-merge-conflict-markers.t (Wstat: 9 Tests: 0 Failed: 0)
Non-zero wait status: 9
Parse errors: Bad plan. You planned 1 tests but ran 0.
Result: FAIL
Note that this is not related to bug 19227.
if the ^>>>>>> and ^<<<<<< matches are done on the same line, the test fail
As saw it failed on *-pref.po files
misc/translator/po/kn-Knda-pref.po
misc/translator/po/ja-Jpan-JP-pref.po
misc/translator/po/nl-BE-pref.po
misc/translator/po/sr-Cyrl-pref.po
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 0d03f143e25f498de780d2ddd1972c3be7947519)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit bdfec37ab66f9c72f86adc7d6045bc83b5a92d88)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 368dfc081576914927b202b1624d558f46dcc7e5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 31 11:47:11 2017 -0300
Bug 19227: Reduce the number of tests run by 00-merge-conflict-markers.t
The number of tests on jenkins is sometimes confusing:
https://jenkins.koha-community.org/job/Koha_Master_D8/lastCompletedBuild/testReport/(root)/t_00_merge_conflict_markers_t/
shows that 00-merge-conflict-markers.t ran 10,751 tests, 124 less than
the previous run. However 124 files have not been removed from the
codebase!
I suggest to count only 1 test for all files.
Moreover files from blib and cover_db are counted, they should be
excluded.
Test plan:
prove t/00-merge-conflict-markers.t
must return green
echo ">>>>>>>" >> mainpage.pl
and run the test again
It should now fail
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Works as advertised.
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 f8502b0d197bab4b4966e9e02253d30f7fcf29f8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 7394fc99fccff9bc8414147fe7fe9b9b6f2f422c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit eb638bdc977ebfe7f9b13e22593109388dcffa9c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 29 16:16:56 2017 -0300
Bug 19391: (bug 19128 follow-up) Fix failing tests from auth_values_input_www.t
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit b6f8cf43698979914704dd08c45f11e6b8e406ee)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 90dffe1c68b00244c010e95a00a002f913a3f02a)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b975b971b4609fa005e69fb11832f560b748156a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 5 17:42:21 2017 -0300
Bug 18794: Fix test ListMetadataFormats in OAI/Server.t
This test may fail on slow servers, it compares the response date with
'now', but both can differ a bit.
https://jenkins.koha-community.org/job/Koha_Master_D8/198/consoleFull
Failed test 'ListMetadataFormats'
at t/db_dependent/OAI/Server.t line 150.
Structures begin differing at:
$got->{responseDate} = '2017-06-12T14:31:51Z'
$expected->{responseDate} = '2017-06-12T14:31:50Z'
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 6 ++--
C4/Circulation.pm | 6 ++--
C4/Reserves.pm | 28 ----------------
C4/SIP/ILS/Patron.pm | 3 +-
Koha/SuggestionEngine/Plugin/AuthorityFile.pm | 5 ++-
Koha/SuggestionEngine/Plugin/ExplodedTerms.pm | 7 ++--
.../en/includes/catalogue/itemsearch_item.json.inc | 3 +-
.../prog/en/includes/messaging-preference-form.inc | 20 +++++++++---
.../prog/en/modules/admin/authorised_values.tt | 4 +--
.../prog/en/modules/admin/preferences/patrons.pref | 2 ++
.../prog/en/modules/catalogue/itemsearch.tt | 4 +--
.../prog/en/modules/members/memberentrygen.tt | 2 +-
.../prog/en/modules/reserve/request.tt | 4 ++-
.../prog/en/modules/tools/batch_delete_records.tt | 2 +-
.../en/modules/tools/batch_record_modification.tt | 2 +-
.../bootstrap/en/modules/opac-messaging.tt | 10 ++++--
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 20 ++++++++++--
opac/opac-account-pay.pl | 1 +
opac/opac-changelanguage.pl | 14 +++++---
t/00-merge-conflict-markers.t | 30 +++++++----------
t/Calendar.t | 9 ++++--
t/SuggestionEngine_AuthorityFile.t | 2 +-
t/db_dependent/00-strict.t | 21 +++++++++++-
t/db_dependent/Acquisition/close_reopen_basket.t | 15 +++++++--
t/db_dependent/Circulation/Returns.t | 4 ++-
t/db_dependent/Koha/Patrons.t | 16 ++++-----
t/db_dependent/Koha_Elasticsearch_Indexer.t | 23 ++++++++++++-
.../Koha_SearchEngine_Elasticsearch_Search.t | 17 +++++++++-
t/db_dependent/OAI/Server.t | 6 ++--
t/db_dependent/SIP/Patron.t | 34 +++++++++++++++++++-
t/db_dependent/SuggestionEngine_ExplodedTerms.t | 4 +--
t/db_dependent/www/auth_values_input_www.t | 26 +++++++++------
32 files changed, 233 insertions(+), 117 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list