[koha-commits] main Koha release repository branch 16.05.x updated. v16.05.16-31-g8383e75
Git repo owner
gitmaster at git.koha-community.org
Wed Sep 20 04:14:44 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.05.x has been updated
via 8383e7546495a042f622826c95eee6274765b5d6 (commit)
via 552af02c9f4e800d49334e3b87f50bb76da7bba8 (commit)
via 286b6f4e3e8db593fbe218ab08c622e5491ac44d (commit)
via 65945e30f71fe353c995bab97a5b6a333326b570 (commit)
via 38cbc453e0cc4a509fe267e32f3903393f449d41 (commit)
via a1b569f89eead58d274a6c75d2790bda94fc0c55 (commit)
via c8fbb9c58bd72031b77d52327004ba441e71cdb9 (commit)
via a53c3efd4c1773a609f2929a61b7324504cc18eb (commit)
via 99e7f928b1bdd7ca997c6ae403a691f90866eeb4 (commit)
via 65d5ad70b65189177622c4886f2718a0130cdbae (commit)
via 9bcd719faa3aa153ebbdbc06d131daab4738d432 (commit)
via 8c85724700a39832d0e0c97a942dc5cc564d2282 (commit)
via 55a79b817af6778212290b121d2674e58dec0a0a (commit)
via 4011f07614ec5223858dd2f7d88376a95d2ad749 (commit)
via cc01ff2b91dde32d86306ce5c013b6bd041ec786 (commit)
via 5af39bac74091095289a6aab44b3cfbefc016629 (commit)
via e76959bdbbfa9288523f8a884b82914ad3ae5298 (commit)
via 19e5f77c5f8c785dd0a1ed3f92af814e18bc147b (commit)
via 1be172f350150164c5d56e12d2b4614924821920 (commit)
via 697202c115a58cf3f94d867c5e7ba4ab929e8b7c (commit)
via 635c5290ab0e24ae72bea4b66cf69af6d2ba7d6c (commit)
via 8e42db82d9a9e467f9b2f0c9730b3089bfc9ff00 (commit)
via f7199ade29131803652e8d8fba7996ed6484383a (commit)
via 29260299c314bee90980f105baa345072fc35f84 (commit)
via 40e2970eeebdc8b05ea10b7e0159faa2a3fa80bc (commit)
via 6977e2200daa8f1a8cf7dd6d2bf2650ee346d313 (commit)
via 722c26c4ef16074624f0606233a1671509289bd6 (commit)
via d0816520fc51991e386b844d8e06c66feb6af1c8 (commit)
via 827f50fc113029628b21a0801a521aa4db33978b (commit)
via be8656fa7f7c0a76a913fb886062b79db5f35360 (commit)
via 66dde9573ad70a0dfd3c381690668590b70a5449 (commit)
from 70396650a2c556274ee075fa6d5babc6721edddb (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 8383e7546495a042f622826c95eee6274765b5d6
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'
commit 552af02c9f4e800d49334e3b87f50bb76da7bba8
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>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 286b6f4e3e8db593fbe218ab08c622e5491ac44d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 10 09:10:52 2016 +0100
Bug 17249: GetKohaAuthorisedValuesFromField - rm GetAuthValCodeFromField
The subroutine GetAuthValCodeFromField was only used from
GetKohaAuthorisedValuesFromField.
Test plan:
git grep GetAuthValCodeFromField
should not return any occurrences.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 65945e30f71fe353c995bab97a5b6a333326b570
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 10 12:10:46 2016 +0100
Bug 17249: Remove GetKohaAuthorisedValuesFromField
Remove the subroutine, it's no longer in used.
Test plan:
git grep GetKohaAuthorisedValuesFromField
should not return any occurrences.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 38cbc453e0cc4a509fe267e32f3903393f449d41
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 5 16:12:56 2016 +0100
Bug 17249: Remove GetKohaAuthorisedValuesFromField - (follow-up) inventory
Before this patch set, the tests in
t/db_dependent/Items/GetItemsForInventory.t were executed in 4s. But
with the previous patch, it was in 45sec(!)
To make sure decrease this execution time to what it was before, this
patch introduces a local to avoid the same query to be executed several
times.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a1b569f89eead58d274a6c75d2790bda94fc0c55
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 10 12:10:09 2016 +0100
Bug 17249: Remove GetKohaAuthorisedValuesFromField - inventory
This patch deals with the inventory files calling
GetKohaAuthorisedValuesFromField.
Test plan:
prove t/db_dependent/Items/GetItemsForInventory.t
should still return green
Use the inventory tool, on the result page the AV descriptions should
correctly replace the codes
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c8fbb9c58bd72031b77d52327004ba441e71cdb9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 10 11:36:40 2016 +0100
Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add search_by_marc_field
This patch adds a new Koha::AuthorisedValues->search_by_marc_field
method.
It will permit to replace several subroutine from C4::Koha dealing with
authorised values.
It also uses this new methods to replace an occurrence of
GetKohaAuthorisedValuesFromField in C4::Record::marcrecord2csv
Test plan:
prove t/db_dependent/AuthorisedValues.t
should return green
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit a53c3efd4c1773a609f2929a61b7324504cc18eb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 10 11:28:40 2016 +0100
Bug 17249: Remove GetKohaAuthorisedValuesFromField - add tests
This patch adds a few tests to C4::Record::marcrecord2csv
The subroutine was not covered enough to validate that this patch set
won't add regressions.
Note that the patch set will fix an issue: If 2 subfields of a field are
linked to AVs and you want to display them in a CSV, they won't be
replaced with their descriptions.
Test plan:
Apply the patch, and make a copy of t/db_dependent/Record/marcrecord2csv.t
Checkout master and prove marcrecord2csv.t
Tests should fail
Checkout the branch with the whole patch set applied
The tests should pass
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 99e7f928b1bdd7ca997c6ae403a691f90866eeb4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 10 09:07:26 2016 +0100
Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add classes MarcSubfieldStructure[s]
This patch adds the 2 Koha::Object based classes for the
marc_subfield_structure table
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 65d5ad70b65189177622c4886f2718a0130cdbae
Author: Mason James <mtj at kohaaloha.com>
Date: Wed Sep 20 12:57:52 2017 +1200
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>
commit 9bcd719faa3aa153ebbdbc06d131daab4738d432
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 8c85724700a39832d0e0c97a942dc5cc564d2282
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>
commit 55a79b817af6778212290b121d2674e58dec0a0a
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>
commit 4011f07614ec5223858dd2f7d88376a95d2ad749
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: Mason James <mtj at kohaaloha.com>
commit cc01ff2b91dde32d86306ce5c013b6bd041ec786
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 5af39bac74091095289a6aab44b3cfbefc016629
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>
Conflicts:
reports/guided_reports.pl
commit e76959bdbbfa9288523f8a884b82914ad3ae5298
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 19e5f77c5f8c785dd0a1ed3f92af814e18bc147b
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 1be172f350150164c5d56e12d2b4614924821920
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 697202c115a58cf3f94d867c5e7ba4ab929e8b7c
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 635c5290ab0e24ae72bea4b66cf69af6d2ba7d6c
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 8e42db82d9a9e467f9b2f0c9730b3089bfc9ff00
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 f7199ade29131803652e8d8fba7996ed6484383a
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 29260299c314bee90980f105baa345072fc35f84
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>
Conflicts:
t/db_dependent/SIP/Message.t
commit 40e2970eeebdc8b05ea10b7e0159faa2a3fa80bc
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>
Conflicts:
t/db_dependent/SIP/Message.t
commit 6977e2200daa8f1a8cf7dd6d2bf2650ee346d313
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 722c26c4ef16074624f0606233a1671509289bd6
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 d0816520fc51991e386b844d8e06c66feb6af1c8
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>
commit 827f50fc113029628b21a0801a521aa4db33978b
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Jun 7 11:29:46 2017 +0200
Bug 18741: Fix loading of SQL files in web installer
Test plan:
1. Start a normal install using the web installer
2. When asked to select data to load, verify that
'message_transport_types' is checked, and check some optional data
files
3. Continue the install to the end
4. Verify that message_transport_types is not empty, and that the
optional data you checked is there
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit be8656fa7f7c0a76a913fb886062b79db5f35360
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri May 5 15:00:05 2017 +0200
Bug 18551 - Hide with CSS dynamic elements in member search
In member search page, the result table is in Ajax so fully managed by Javascript. There is also a yellow dialog message prepared in HTML.
Thoses elements are hidden by JS code : ie $("#patron_list_dialog").hide().
The problem is that the static page is first loaded an displayed then the JS code runs an hides the elements.
On a low performance computer, this action is visible and looks like there is a blinking yellow message.
I propose to hide with CSS so that thoses elements are not displayed in static page and are there shown in dynamic JS code.
Test plan :
Check display is unchanged :
- Go to home page /cgi-bin/koha/members/members-home.pl
- Perform patron search from header search box
- Perform patron search by clicking on a letter
- Perform patron search from filters (left of results table)
- Select a patron and add it to a list => you see the yellow message
Yellow message does no longer appear with this patch.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Philippe <philippe.audet-fortin at inlibro.com>
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 5cc536c68b221823f4335b5b5db1108521f88a71)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 66dde9573ad70a0dfd3c381690668590b70a5449
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 7 13:50:32 2017 -0300
Bug 19053: Keep auto_renew flag if a confirmation is needed
If an item is checked out with the auto renewal flag and a confirmation
is needed (holds exist, past due date, etc.) the auto renewal flag will
get lost.
Test plan:
- Check an item out and specify a past due date
- Confirm the checkout on the confirmation screen
=> Without this patch the checkout is not marked as auto renewal
=> With this patch applied the auto renewal flag will be set to the
checkout
Signed-off-by: Josef Moravec <josef.moravec at gmail.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 3808dbc1d22b3adc43a09ba7ce00aaca01f95f5a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 8f3a7d800271cb2611de0cb369e907b16c30fb0b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth_with_cas.pm | 1 +
C4/Items.pm | 38 ++--
C4/Koha.pm | 57 +-----
C4/Record.pm | 11 +-
C4/SIP/ILS.pm | 37 ++--
C4/SIP/ILS/Item.pm | 2 +-
C4/SIP/ILS/Transaction/Checkin.pm | 4 +-
C4/XSLT.pm | 6 +-
Koha/AuthorisedValues.pm | 18 ++
Koha/{City.pm => MarcSubfieldStructure.pm} | 6 +-
...blioFrameworks.pm => MarcSubfieldStructures.pm} | 10 +-
Koha/Number/Price.pm | 3 +
admin/aqbudgets.pl | 3 +-
circ/circulation.pl | 1 +
installer/install.pl | 2 +-
.../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 | 31 +--
.../prog/en/modules/circ/circulation.tt | 1 +
.../prog/en/modules/members/member.tt | 4 +-
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 2 +-
.../bootstrap/en/includes/item-status.inc | 10 +-
misc/migration_tools/rebuild_zebra.pl | 10 +-
reports/guided_reports.pl | 2 +-
t/Number/Price.t | 22 ++-
t/db_dependent/AuthorisedValues.t | 35 +++-
t/db_dependent/Items/GetItemsForInventory.t | 12 +-
t/db_dependent/Koha/MarcSubfieldStructures.t | 57 ++++++
t/db_dependent/Record/marcrecord2csv.t | 42 +++-
t/db_dependent/SIP/Message.t | 208 +++++++++++++++++---
tools/inventory.pl | 5 +-
tools/modborrowers.pl | 2 +-
33 files changed, 500 insertions(+), 209 deletions(-)
copy Koha/{City.pm => MarcSubfieldStructure.pm} (86%)
copy Koha/{BiblioFrameworks.pm => MarcSubfieldStructures.pm} (80%)
create mode 100644 t/db_dependent/Koha/MarcSubfieldStructures.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list