[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.11-1-39-g42b3010
Git repo owner
gitmaster at git.koha-community.org
Sat Sep 16 09:15:14 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 42b30105ffd2b6814873fad1cff5cd4d35c140ee (commit)
via ff554650015bb06bf4bf0146d81c653bd0f2c61d (commit)
via b559399ad52645041697558ae3eb710628c53781 (commit)
via 632d47db0b86542512b443e9bb69c00c3add31a7 (commit)
via 9fc57e9768426bf84d00e8238ff3851ced6e2997 (commit)
via a374afe92df9b25a231c20296f50c351606d2e32 (commit)
via 85a57d0f94c18483ff67ef53a7e067c8ebdca4b9 (commit)
via 605dcc6e1aa4b0666eb646813f13f7088d7d2b3d (commit)
via 65eb8108509cc5c50a2e819585efe34bdb6f7ff3 (commit)
via fc4a184a5fda8571a7548996d5813205d25e6e5f (commit)
via 41350af22570d32148c673e846e45d46fa1806c5 (commit)
via 73533f0b67faba3355b27046d4017714fc08f81d (commit)
via 353d5a1560976c34152ada5895d15446b8cc1754 (commit)
via 3e561bb3d6b1cca470340dd1aa22dab44fc8d193 (commit)
via c4064d0226a67d4aca8eece7c7b54c8f370afaa7 (commit)
via 4c90c0de023ca8edb2cab2425264f367ffacfadb (commit)
via 502dddf9da62c5206d2be7fd94cf3ff95003dc7f (commit)
via 099897fd2738e4589f9e8412be242ccf000fcb69 (commit)
via 255dca62aa5f3989a981b493774517f8f53d01cb (commit)
via d62eea1bf38b0939b173bce2f170fa810bd194aa (commit)
via f270020500ef4956c73c2b9630d70e32ebae6921 (commit)
via 056b10fcec4a68b9e379f3eb1be9120e7b2b3e98 (commit)
from d2b84a87fbeae550a9dbc9800202813daf1affd8 (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 42b30105ffd2b6814873fad1cff5cd4d35c140ee
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Sep 12 14:57:25 2017 +0200
Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
Followup correcting a typo of previous patch :
name="holdingbranch" options = branche
it is branche[s]
Test plan :
- Look at 'Current location' in item search
=> Without patch you see only 'All libraries'
=> With patch you see 'All libraries' and each existing library, like in 'Home library'
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 889fabe9f28f3b6ef35fc36e73b12652f258510c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit ea316ad4ae5b4aea4c255d08d36bfcb0b705c23b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ff554650015bb06bf4bf0146d81c653bd0f2c61d
Author: Marc Véron <veron at veron.ch>
Date: Thu Jun 29 15:22:54 2017 +0200
Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
This patch removes entries like the following in translations of itemsearch.tt:
"[%% INCLUDE form_field_select name=\"homebranch\" options = branches "
"empty_option = \"All libraries\" %%] [%% INCLUDE form_field_select name="
"\"holdingbranch\" options = branches empty_option = \"All libraries\" %%] %s "
"[%% INCLUDE form_field_select name=\"location\" options = locations "
"empty_option = \"All locations\" %%] %s "
New patch on top of Bug 18633 that resolves parts of initial comment.
To test:
- Verify that in itemsearch.tt no tt directives are splitted by new lines
(search for [% INCLUDE )
- Verify that itemsearch.tt works as before
Followed test plan and verified that tt directives are not split by new
lines, the changes to the fieldset tags in comment 3 have been removed
and itemtype.tt still works correctly as before
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 25fa02272d16c98d49a6020e867f60bc0510d960)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit dcafcbc036f9229d2d2854012f80fe051012a349)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b559399ad52645041697558ae3eb710628c53781
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Aug 2 11:21:58 2017 +0200
Bug 19023 - inventory tool performance
Inventory tool performance seems to be worst since 16.11.
I think it is because of authorized values computing changed by Bug 17249.
For each subfield of each item, we try to get the authorized value description with Koha::AuthorisedValues->search_by_marc_field.
But this method does not use cache like Koha::AuthorisedValues->get_description_by_koha_field.
I propose to use Koha::AuthorisedValues->get_description_by_koha_field and also to look for authorized value description only for item fields used in TT : location, notforloan, itemlost, damaged, withdrawn.
I have experimented inventory time on 100 items from 5s to 1s.
Test plan :
- Without patch
- Perform inventory with barcode file
- Check results and mesure execution time
- Apply patch
- Reperform inventory with same barcode file
- Check results is the same
- Compare execution time
- Run prove t/db_dependent/Items/GetItemsForInventory.t
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 95f1844e6c46ff51de9f95f99fcdf3369c756fd4)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 4c76583e6d3079bad51048f62f43c3c433f1e9bd)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 632d47db0b86542512b443e9bb69c00c3add31a7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 4 12:06:56 2017 -0300
Bug 18927: Use fully qualified subroutine names in C4::Items
rebuild_zebra.pl fails in some conditions (perl version?)
I do not recreate but it has been reported that reindex fails with:
error retrieving biblio 94540 at /usr/share/koha/bin/migration_tools/rebuild_zebra.pl line 683, <DATA> line 751.
To fix it we can use fully qualified subroutine names for:
GetMarcFromKohaField
GetMarcBiblio
GetBiblionumberFromItemnumber
TransformKohaToMarc
GetFrameworkCode
Test plan:
Confirm the rebuild_zebra script still works correctly after this patch
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
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 2671eb2f93340e8fb3c794cff918d86c526cc47f)
(cherry picked from commit 1a50b447d3d58b40d8f84e7c264f01abcb42a826)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9fc57e9768426bf84d00e8238ff3851ced6e2997
Author: Alex Sassmannshausen <alex.sassmannshausen at ptfs-europe.com>
Date: Thu Aug 10 13:00:19 2017 +0200
Bug 19073: (bug 15758 follow-up) Dereference correct value from Koha::Object.
* tools/modborrowers.pl: Dereference 'branchcode' rather than
'value'.
Test Plan:
- Carry out "Batch patron modification" with any number of patrons.
+ Change the library.
+ Hit Save.
- The library will not have been updated.
- Apply patch.
- Run same modification.
- The library will have been updated
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.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 8a328a20bf3a74268346104281688b2a81be80e6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 111ab4e63257410bf7ca34e80e46675603072c36)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a374afe92df9b25a231c20296f50c351606d2e32
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Jul 6 08:48:18 2017 +0200
Bug 18900: wrong number format in receiving order
Bug 18471 added number formating in order receive.
I found a bug generated by this.
Koha::Number::Price defines methods to (un)format price depending on CurrencyFormat syspref.
The bug is that for CurrencyFormat US, some params are not defined in this module so there are retrieved from system locale. If system locale is not en_US, the params will be wrong. For example fr_FR will define ',' as decimal and so saved unit price is divided by 1000.
To recreate:
- On a server with locale 'fr_FR'
- With Plack mode
- Set CurrencyFormat on 'US'
- Open a basket
- Place an order for an item
- Close basket
- Receive order with changing 'Actual Cost' to '1,234'
- Note the 'Actual Cost' is now '1.23'
- Run unit test t/Number/Price.t without and with patch
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 e35903574ce666bca32eb4676f311b99bb268ec2)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 92b08a23e3b2c001d208b82b6ffee2af756ca51f)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 85a57d0f94c18483ff67ef53a7e067c8ebdca4b9
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Aug 9 12:01:17 2017 -0300
Bug 18900: (QA followup) Make tests conditional to locale existence
It is important to highlight that tests have been skipped instead of having them pass
on the absence of the required fr_FR.UTF-8 locale installed on the system.
This patch does that check and effectively skips them.
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 61f2ec769073709be3b688654ec355b3f4fbe522)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 1865db52bbf9413574c22ee2c9180137ac357918)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 605dcc6e1aa4b0666eb646813f13f7088d7d2b3d
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Jul 6 08:44:51 2017 +0200
Bug 18900: add UT to Number/Price.t
This patch adds unit tests to t/Number/Price.t in order to valid the problem.
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 91dee226cdd089353dc71e559aa9e0b34fddf72e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit aca614cd95b32d2953927e8e3e908bc1248b541c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 65eb8108509cc5c50a2e819585efe34bdb6f7ff3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jul 6 18:10:10 2017 -0300
Bug 18906: Display all funds the logged in user can use
There are complex conditions to know if a librarian can use a fund, we
cannot do that with a SQL query, we need to use C4::Budgets::CanUserUseBudget
When this patch is applied then all funds are visible to both
superlibrarian patrons and patrons with all acq permissions
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
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 19a7b498e1f4355ab1e4ee0adb5db299613f3f5c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d179da572b1d6bd7066d96f494aa805b86b92ae1)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit fc4a184a5fda8571a7548996d5813205d25e6e5f
Author: David Cook <dcook at prosentient.com.au>
Date: Thu Jul 27 11:58:28 2017 +1000
Bug 18898 - Some permissions for Reports can be bypassed
If you manually visit the following links when you only have
permission to run reports, you'll still be able to access the ability
to create and edit reports:
/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL
/cgi-bin/koha/reports/guided_reports.pl?phase=Edit%20SQL
This patch ties these 2 unaccounted for phases to the create_reports
permission.
With patch, issue no longer can be reproduced.
Signed-off-by: Marc Véron <veron at veron.ch>
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 2fdfbaf0ddbf214c0efb9a3a3c2595a54517f795)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 4b71c9239708cd4d60190ed907fec03d1f8b08bc)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 41350af22570d32148c673e846e45d46fa1806c5
Author: Serhij Dubyk {Сергій Дубик} <serhijdubyk at gmail.com>
Date: Tue Aug 22 17:19:32 2017 +0300
Bug 17827 - Untranslatable "by" in MARC21slim2intranetResults.xsl
Signed-off-by: Serhij Dubyk {Сергій Дубик} <serhijdubyk at gmail.com>
The "by" after the title was not translatable in the result
lists of the intranet. This patch fixes it by removing
a comment, that caused a problem with the translation
scripts.
To test:
Test:
Before this patch in file en-GB-marc-MARC21.po present next paragraph:
msgid "by "
msgstr " by "
According string "by " in the file MARC21slim2intranetResults.xsl can not be translated (in other languages).
After applying this patch performed next command:
cd /usr/share/koha/misc/translator
sudo env KOHA_CONF=/etc/koha/sites/mykohainstance/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl -I /usr/share/koha/lib "./translate" update
Now in the file en-GB-marc-MARC21.po present the following (modified) paragraph:
msgid "by "
msgstr " by "
https://bugs.koha-community.org/show_bug.cgi?id=17827
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 d5ea914f4dc41f78dbb3a59f894f6ecbb9a1afa4)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit afb2cb0c74b6a137652ec1a2e96fc480a5a50f96)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 73533f0b67faba3355b27046d4017714fc08f81d
Author: Marc Véron <veron at veron.ch>
Date: Mon Jun 12 07:48:57 2017 +0200
Bug 18778 - Translatability: Get rid of tt directive in translation for item-status.inc
The file opac-tmpl/bootstrap/en/includes/item-status.inc exposes a template directive where translators should not be confronted with.
"%s %s [%%#- This include takes two parameters: an item structure and an "
"optional loan (issue) structure. The issue structure is used by course "
"reserves pages, which do not use an API to fetch items that populates item."
"datedue. -%%] %s %s %s %s "
This patch fixes new lines inside a tt directive (comment).
It is merely a string patch.
To test:
Verify that the code changes make sense.
(Bonus test: create a new language 'aa-AA', verify that line above does not
show up in aa-AA-opac-bootstrap.po)
NOTE: Followed test plan similar to bug 18776 comment 3.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit c8551645d5bdd3e6fb5b7e03280521a2fbaef636)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit b9ff28f719cb17d37e5eaecc4fb09b9032cc38e5)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 353d5a1560976c34152ada5895d15446b8cc1754
Author: Marc Véron <veron at veron.ch>
Date: Tue May 23 17:09:49 2017 +0200
Bug 18660: Translatability: Get rid of template directives [%% in translation for patroncards-errors.inc
Translation for koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc
contains a lot of (partial) template directives like:
%%]%s %sLayout: [%%
This patch fixes it
To test:
- Verify that code changes make sense
- Apply patch
- Create a translation (cd misc/translator , then: perl translate create aa-AA
- Verify that in po/aa-AA-staff-prog.po contains no fragments like %%] or [%%
for patroncards-errors.inc
- Try to get an error: Try a link like
http://[YOUR SERVER]/cgi-bin/koha/patroncards/create-pdf.pl?batch_id=1&template_id=999&layout_id=999&start_card=1
...where template_id and layout_id do not exist
(Amended for comment #2 2017-06-05 mv)
(Amended for comment #6 2017-08-02 mv)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 7e39bbc61aedd6383f4d6a1b4728711c6922e877)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 036b317c0c0e96b0eb344d767cca7f87da4fb875)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3e561bb3d6b1cca470340dd1aa22dab44fc8d193
Author: Marc Véron <veron at veron.ch>
Date: Mon May 22 21:09:06 2017 +0200
Bug 18652: Get rid of tt directive in translation for uncertainprice.tt
Translation tool shows toe following for ncertainprice.tt
0; url=[% scriptname %]?booksellerid=[% booksellerid %]
This patch fixes it.
To test:
- Apply patch
- Verify that code change makes sense
- Verify that Home > Acquisitions > [vendor] > Uncertain prices for [vendor]
works as before
- Additional test (for a langunage 'aa-AA')
perl translate create aa-AA
verify that line 41 no longer appears in aa-AA-staff-prog.po
Amended to switch from BLOCK to a template variable, see comment #5
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 2ee82801c7a8686523f9c5e95b0f43d44e52e4ab)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 4d427740196bb0a9bcfe80787af8cdf769c06b76)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c4064d0226a67d4aca8eece7c7b54c8f370afaa7
Author: Marc Véron <veron at veron.ch>
Date: Fri Aug 4 10:52:13 2017 +0200
Bug 18649: Translatability: Get rid of tt directive in translation for admin/categories.tt and onboardingstep2.tt
New patch without trailing IF construction in tt directives as
requested in comment #28
To test: Verify that translation tool no longer shows tt directives as
described in comment #1
New patch, needs SO.
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 79338bde3e01708fe331a54745f45c620c121805)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 0f9175c0b26e9e8d65bf39dab80d99e5d7455346)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 4c90c0de023ca8edb2cab2425264f367ffacfadb
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 10 14:15:09 2017 +0200
Bug 18921: Resolve a few warnings in C4/XSLT.pm
Resolves warnings like:
Use of uninitialized value in hash element at C4/XSLT.pm line 262.
Use of uninitialized value in numeric eq (==) at C4/XSLT.pm line 267.
Use of uninitialized value $status in concatenation (.) or string at C4/XSLT.pm line 300.
Note: Line numbers are not exactly the same anymore.
Test plan:
[1] Enable XSLT view in OPAC
[2] Without this patch, you will probably have some of these warnings when
doing some opac searches.
[3] Apply this patch. Check the logs again.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.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 5f989a81dff29db78620057d70ed864b32486bc0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 1c8287632ea36e6d2a8ade922fe129f5f792d6d3)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 502dddf9da62c5206d2be7fd94cf3ff95003dc7f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 11 16:08:41 2017 -0300
Bug 18996: [16.11.x] use Koha::OldIssues instead of Koha::Old::Checkouts
commit 099897fd2738e4589f9e8412be242ccf000fcb69
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Aug 2 13:01:47 2017 +0200
Bug 18996: [16.11.x] [QA Follow-up] Remove global variables from Message.t
As per request of Colin in comment18, this patch makes the use of global
variables in Message.t no longer needed.
The three subtests are now completely independent and could well be moved
to separate test scripts.
Note: Strictly speaking, the use of global (package) variables could
potentially introduce new bugs (e.g. if the value is modified outside the
script). This seems not to be the case here, but we are safe now.
Test plan:
Run the test again.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 255dca62aa5f3989a981b493774517f8f53d01cb
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sat Jul 29 13:38:31 2017 +0200
Bug 18996: [16.11.x] Add checkin subtest in SIP/Message.t
Variable $branch was not used.
Promoted some global vars to our.
Shared the branchcode between all three subtests now.
The third subtest contains all six cases mentioned in the first patch.
Test plan:
Run t/db_dependent/SIP/Message.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit d62eea1bf38b0939b173bce2f170fa810bd194aa
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Aug 1 14:10:56 2017 +0200
Bug 18996: [16.11.x] Resolve an uninitialized warning from ILS/Item.pm
From the syslog call on line 107/108. The field $item->{title} has not
been initialized. When catching the warns in a test script with Test::Warn,
I got:
Use of uninitialized value $args[1] in sprintf at /usr/lib/x86_64-linux-gnu/perl/5.20/Sys/Syslog.pm line 423.
This simply resolves the warning. We might have a closer look to this title
field on another report though.
Test plan:
Run Message.t from the next patch without this fix. It will fail since the
additional warning makes warnings_like return false.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit f270020500ef4956c73c2b9630d70e32ebae6921
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 28 10:29:51 2017 +0200
Bug 18996: [16.11.x] Handle data corruption from old_issues at SIP checkin
As per bug 18966 AddReturn returns false with a DataCorrupted message
when the issue_id at hand already occurs in the old_issues table.
This should be handled when returning an item via SIP too. SIP should
not pretend that the checkin was successful, since this item needs
special care.
The following six different situations are handled:
[1] An attempt to checkin an invalid barcode is handled as before. The
ok flag is false; the screen message shows 'Invalid Item'.
[2] We receive a DataCorrupted message: the alert type is set to the
unused 98 code to indicate this new error condition. The ok flag
is false; the screen message shows 'Checkin failed: data problem'.
[3] The item checked in was not checked out AND the option checked_in_ok
is active. The ok flag is set to true; no screen message.
[4] The item checked in was not checked out AND the option checked_in_ok
is not active. The ok flag is not changed (normally false); the screen
message shows 'Item not checked out'.
[5] (The regular checkin) The item was checked out and AddReturn returned
true. The ok flag is true; no screen message.
[6] ("Otherwise") The item was checked out, but AddReturn returned false.
The ok flag is false; the screen message shows 'Checkin failed'.
Note: Currently this case only refers to the Wrongbranch and withdrawn
messages from AddReturn (where doreturn==0).
Note: Situation 1 and 5 are unchanged. Behavior is slightly changed for
situation 3 and 4; the option is only used when the item was not checked
out. Situation 2 and situation 6 are changed. After bug 18966 SIP
returned OK in case of data corruption (while checkin failed). In the
remaining cases under [6] SIP also returned OK while checkin failed.
Test plan:
[1] Test all six cases listed above. In order to simulate data corruption
insert the issue_id at hand in old_issues before you check in.
In cases 3 and 4 you need to toggle the option in your SIPconfig.xml and
restart the SIP server.
Case 6 can be tested by checking out at branch A, adjusting the value
of pref AllowReturnToBranch and checking in at branch B.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 056b10fcec4a68b9e379f3eb1be9120e7b2b3e98
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Aug 2 10:15:10 2017 +1200
Bug 18046: CAS logout infinite redirect
To test (You need a CAS server and CAS configured in Koha)
1/ Login using CAS in Koha
2/ Logout in Koha
3/ Notice you get redirected again and again
4/ Apply patch
5/ Login with CAS, then logout
6/ Notice logout works, but no longer infinitely redirected
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Patch has been in production use for several months
on several instances. Fixes a critical bug.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Looks like a typical workaround, but evidently works.
Not tested with CAS.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 13ca4962068b184f803b6588e53e39209a77f2b6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit c87b963818076a58661922116893ff052b2d76a9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth_with_cas.pm | 1 +
C4/Items.pm | 30 +--
C4/SIP/ILS.pm | 37 ++--
C4/SIP/ILS/Item.pm | 2 +-
C4/SIP/ILS/Transaction/Checkin.pm | 4 +-
C4/XSLT.pm | 6 +-
Koha/Number/Price.pm | 3 +
admin/aqbudgets.pl | 3 +-
.../prog/en/includes/patroncards-errors.inc | 58 +++---
.../prog/en/modules/acqui/uncertainprice.tt | 3 +-
.../prog/en/modules/admin/categories.tt | 6 +-
.../prog/en/modules/catalogue/itemsearch.tt | 36 +---
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 2 +-
.../bootstrap/en/includes/item-status.inc | 10 +-
misc/migration_tools/rebuild_zebra.pl | 8 +-
reports/guided_reports.pl | 2 +-
t/Number/Price.t | 22 ++-
t/db_dependent/SIP/Message.t | 206 +++++++++++++++++---
tools/inventory.pl | 22 +--
tools/modborrowers.pl | 2 +-
20 files changed, 312 insertions(+), 151 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list