[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.13-24-g6b96258
Git repo owner
gitmaster at git.koha-community.org
Mon Sep 24 15:51:29 CEST 2018
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, 17.05.x has been updated
via 6b96258b1e04d00296584c628c98e553a08730e2 (commit)
via c8a1422d41b71669c2f761174974b6839a797b83 (commit)
via 90b80e23722508e0c57dd64703b9f61fe3a3257e (commit)
via 593dcf02e578acb0da9458bd63aba47b2a4f0973 (commit)
via 4b8f5e5dc6d15549fde7f45f53a9675ee9f0b952 (commit)
via d7916f85a8536ff983ec666b6c8cafeeb313a259 (commit)
via 0403eac5715e7f13f36a0c8724fdbf12db6b46d2 (commit)
via 54d218d709d7309803caa371f697af434e8650ed (commit)
via cbd29edc5ae70d2110bf5c33311850ed667fd1f1 (commit)
via 09f1806987fc4fef5f4601b042f59986fb66d8de (commit)
via 992f68ce61229b19acc15c1519ae487676264004 (commit)
via c5521e65f78d845083b6e9bcc247aab13d87ed5c (commit)
via bf43e2e5d37467807d9b485adbcfbaffa471f196 (commit)
via e6c573180680d28d0457efe9b9ce27fd595223de (commit)
via b086e37d672d9a7e5d6c2fc51d8507678b1f908c (commit)
via e47f9d6b1614cfbacb743fe974ace7eff682c4ba (commit)
via d5ebdb75e00180f19d4ef77058e96ea21541bdb3 (commit)
via 4b7e5108ea3e221998b38a6b7eeab4475f50d4d5 (commit)
via b4d9ed346ed193e7a72d48745ad26b55737bfa7d (commit)
via 967d34815c92308fb74f6ac2965b1be807c17353 (commit)
via 0c56d4e0f3112557c484954491e990c1d39abbd3 (commit)
via b535a0da267c3b1dd4e833a0af3bae48d28879e9 (commit)
via 549148d74b6368697e216a31c39296016668a8d1 (commit)
via 8b8b5061b49953e876a145ed22a971858b7842c1 (commit)
from a890b4dbf7f6385ff769a68c8179c0fd1fc09e4d (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 6b96258b1e04d00296584c628c98e553a08730e2
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Aug 13 09:54:44 2018 +0100
Bug 21199: (QA follow-up) Add show_attributes to perldoc
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit d555126d8f8fe8c9a4bdd6563c8fcd82b971fc84)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 7ab3f8ba72e70c67913fee1b53409ba089c7bdd3)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit c8a1422d41b71669c2f761174974b6839a797b83
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 9 19:34:58 2018 -0300
Bug 21199: Hide patron's attributes from ILSDI if required
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit dabd86cf6eab70751cc1a476b47cdf9f1648788f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 0d588160cf38e0ca5b79955376f18710d0a0ca3e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 90b80e23722508e0c57dd64703b9f61fe3a3257e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jul 9 13:24:44 2018 +0000
Bug 21054: Remove extraneous </body> tag from sco-main.tt
To test:
1 - Enable sco and setup AutoSelfCheck
2 - Try to use self checkout and print receipt
3 - You shoudl be redirected to the login page
4 - Apply patch and restart all the things
5 - Try to use self checkout and print a receipt
6 - Success!
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit d9a94cc7e5fbcf924a1368423179c7d05fa49c8b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit fe1f65c6c1dbf0f44234a96735a3fba1bda1009e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 593dcf02e578acb0da9458bd63aba47b2a4f0973
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Jun 15 12:56:36 2018 +0200
Bug 20951: add missing use Koha::Patron::Debarments in Koha::Patron::Discharge
Koha::Patron::Discharge was missing use Koha::Patron::Debarments used in discharge() method.
Test plan :
1) Enable pref useDischarge
2) Go to OPAC user page
3) Go to 'ask for a discharge' tab
4) Click on 'Ask for a discharge'
5) Go to staff interface : /cgi-bin/koha/members/discharges.pl
6) Click on Allow
=> Without patch you get software error
=> With patch the discharge is validated
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: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 842abeb423b81c61d2774f8446a5bcbb2d0a258c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 9ef0e010cca0de135d8a270b2fd70ba155d018b6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4b8f5e5dc6d15549fde7f45f53a9675ee9f0b952
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Jun 8 09:43:13 2018 +0000
Bug 20903: Remove unnecessary category code parameters
Test plan:
0) Do no apply the patch
1) Have only one adults patrons category defined
2) Add a fine to child patron and pay it
3) Try to print the payment receipt (file printfeercpt.pl)
4) You see only ISE
5) Apply the patch
6) Try the printing again
7) Now you should see right receipt
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: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 5f03b21cf3a7141dc0f2ae2b1922505d55d4cd34)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 3e0ccc346ca6f6b758b88cd0d4f09c2e6bdb44e4)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d7916f85a8536ff983ec666b6c8cafeeb313a259
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Tue May 15 13:58:03 2018 +0200
Bug 20693: Update control file
Auto-generated file.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
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 2a6cad2fa9d8e4419be7538949b4ce9a758d0e9b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 3b92a5eb4f04edd2de71d4e7437452ca76ce0b50)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 0403eac5715e7f13f36a0c8724fdbf12db6b46d2
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Tue May 15 13:47:10 2018 +0200
Bug 20693: Plack fails, because 'libcgi-emulate-psgi-perl' package is not installed
Add CGI::Emulate::PSGI to PerlDependencies.pm
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
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 f9e06c38495ad9b7c14a9866414c229da92833db)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 459e6b7486944337f96d281392481a360be631f5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 54d218d709d7309803caa371f697af434e8650ed
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 11 11:29:15 2018 -0300
Bug 21018: Allow uris defined in the item
We need to search for uri defined for the itemnumber we passed in
parameter.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 1d888c8d0e9ee2eda9c793cf75fd73a7afeaef16)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 0971fed0b85834f20bc2450c7e68e1d252363b56)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 99b6a69aef18a58d91129cb5b5a299f4ee0257f8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit cbd29edc5ae70d2110bf5c33311850ed667fd1f1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 29 10:29:30 2018 -0300
Bug 21018: Fix TrackClicks for 952$u
Caused by
commit 51b6cf2aafbfb45b9fcb072403b986fe3c2add53
Bug 19847: Track links within the records and 404 for others
We should also accept uri stored in items.uri (952$u)
Test plan:
- Turn on TrackClicks
- Defined uri for some items
- At the OPAC click on the link (from opac-detail.pl)
=> Without this patch you will get 404 (redirected from tracklinks.pl)
=> With this patch applied you will be redirected correctly and the
linktracker will be filled correctly
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d14ed73744fa23d4ed649da6d847f4b37cdfce92)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 20bfb6730f3d93d388a538871b94e83d867ac796)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 84f5ae669c36e10ec28d8015197a6450fe11eac8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 09f1806987fc4fef5f4601b042f59986fb66d8de
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Aug 21 11:25:53 2018 +0000
Bug 20773: DBRev 18.05.02.003
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 7dab4cd903f9623fb52592e65d57c93b6156d2aa)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 31bf49b849a949c9f809d2ca2eaa1cecafb55036)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit a27a32cab66a0c6a529d0f7918256d5615737dea)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 992f68ce61229b19acc15c1519ae487676264004
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed May 16 15:39:04 2018 +0200
Bug 20773: (bug 20724 follow-up) Add a simple db revision
We should correct bad data too.
This is a trivial, pragmatic approach. Instead of doing a complex
calculation with holidays etc. (as was done on 12063), we just add
MaxPickupDelay or 7 days to today probably resulting in a little bonus
time. Only for waiting holds. When the ReservesNeedReturns pref was not
Automatic, there should be no changes.
== Test plan ==
1. git checkout c585f1149770ec401f188e061211501897cec0bf~1
This the commit before bug 20724's patches.
We need that to be able to generate "corrupted data"
2. Set ReservesNeedReturns to "Automatically"
3. Place a hold on a specific item
4. The hold should have an *empty* expiration date
record page → Hold → "Expiration" column
5. Apply this patch
6. Run updatedatabase.pl
7. Refresh the page
8. The hold should have an expiration date (not empty)
9. Celebrate! 🎉🎊🥳
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Bug 20773: (followup) Remove MySQLism
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit a4ec768e3787ff3ee426949c0f03188dd4d15e82)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 6eb334e244a2cbaf84d8ac874348c1443252e656)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 800ca2f6d88217a8ca706999eb603d98e6487d2f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit c5521e65f78d845083b6e9bcc247aab13d87ed5c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed May 16 14:43:27 2018 +0200
Bug 20724: (QA follow-up) Remove two obsolete comment lines
No test plan :)
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 88ac8c499f878a1c0ac622d53742a3d9acea1f64)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 31262bf4c5754c39cff3f510fc7af6d4eaf531b3)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit bf43e2e5d37467807d9b485adbcfbaffa471f196
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 10 11:40:33 2018 -0300
Bug 20724: Add tests for ReservesNeedReturns
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 8b6dc6b23ccb26e18c437a578b4e20174ee1ea58)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit b9dbce17b4c1121a9c46273f6e43cc3b91ff4cbb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit e6c573180680d28d0457efe9b9ce27fd595223de
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 10 11:40:11 2018 -0300
Bug 20724: Move the ReservesNeedReturns logic to AddReserve
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 1798d22e764bebf46e2915e1c0b7c3360ea8dd51)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 04ca9e923f4b5d0f0c8f78b9e08742b899dd7d3f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b086e37d672d9a7e5d6c2fc51d8507678b1f908c
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Thu May 10 08:12:04 2018 -0400
Bug 20724: Correctly mark an hold as waiting - ReservesNeedReturns
We need to call Koha::Hold->set_waiting to correctly
calculate the expiration date.
It fixes a regression introduced by
commit 26634151dbce0bf39ff6c9eda5b58bb993996a2d
Bug 12063 - Fix QA failures
The expiration date has to be set for waiting holds
== Test plan (time to execute: less than 4min) ==
1. Set ReservesNeedReturns to "Don't automatically"
2. Place a hold on a specific item
3. Check it in and confirm hold
4. The hold should have an expiration date
record page → Hold → "Expiration" column
5. It should be listed in staff:/cgi-bin/koha/circ/waitingreserves.pl
6. Set ReservesNeedReturns to "Automatically"
7. Place a hold on a specific item
(which should also behave like we check the item in to
keep it for the patron)
8. The hold should have an *empty* expiration date
record page → Hold → "Expiration" column
9. Holds awaiting pickup page should crash
staff:/cgi-bin/koha/circ/waitingreserves.pl
10. Cancel the hold to remove the corrupted data
record page → Hold → the red X
11. Apply this patch
12. Place a hold on a specific item
13. The hold should have an expiration date (not empty)
14. It should be listed in staff:/cgi-bin/koha/circ/waitingreserves.pl
15. Celebrate!
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit c585f1149770ec401f188e061211501897cec0bf)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 2d3b25b04ea6a47ed0f5ebdc3e10fb16b474184f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit e47f9d6b1614cfbacb743fe974ace7eff682c4ba
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jul 23 12:23:07 2018 +0000
Bug 20811: (RM follow-up) fix check for matching
Notice should only be triggered if both settings are false
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 12b505f2b797d77e800a17830f71a9c054cd076b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit b1a07f712c23e62c830117d4c0ca1390044dc25c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit fe341ea4d2e7f1dd176bb27daaf1e69d29e327d6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d5ebdb75e00180f19d4ef77058e96ea21541bdb3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 20 11:46:58 2018 +0200
Bug 20811: (QA follow-up) Prevent calling AddItemBatchFromMarc and ModBiblioMarc without biblionumber
If you use -update but do not find matches (or did not want to match), you
should not call those routines. We should warn and skip this record.
Adding a warn at the start that the choice of options may not be smart.
Note that this needs further attention somewhere else. You could mix
-update with -insert for instance and still see some problems. (May depend
on items with unique barcode etc.)
Test plan:
Run -update without match or isbn.
Or run -update -isbn with a non-matching ISBN.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 15b865c6ee558ef278f911ba3693c38c024c7f11)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 8191625667162ac240a5d0e4d180632bcf100884)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit c71253eb2ed3824cbc6c7d3972319712d3d5bf03)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4b7e5108ea3e221998b38a6b7eeab4475f50d4d5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 20 11:21:11 2018 +0200
Bug 20811: (QA follow-up) Make the isbn check work
The following code was never reached, since $isbn was not filled.
if (!$biblionumber && $isbn_check && $isbn) {
$sth_isbn->execute($isbn);
($biblionumber,$biblioitemnumber) = $sth_isbn->fetchrow;
}
Solution: Fix the code with two $isbn declarations. Move the checkisbn
condition a level deeper.
Test plan:
Run misc/migration_tools/bulkmarcimport.pl -file bib726.utf8 --update -isbn
Since you do not match on biblionumber, the ISBN should match.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit a49a7f08d6dbaf992d70420dae744c75c2ad8aae)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 5094909140081b02c9688faa07fc630feab91f24)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 8989ceb93fd002b91257c370e1584cacae193678)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b4d9ed346ed193e7a72d48745ad26b55737bfa7d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 28 15:19:09 2018 -0300
Bug 20811: Fix wrong usage of ModBiblio
Since
commit cefa7c21e28b88351ee8ae0dfefb80a515323df9
Bug 5635: bulkmarcimport new parameters & features
AddBiblio call has been replaced with ModBiblio, but the return values
are different. We should not replace the value of $biblionumber with
what returns this subroutine.
Test plan:
If you are familiar with bulkmarcimport.pl you should know what to test,
I am not.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d15185025a146656a1ad0d7d5a8eb261581c0f1e)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit c76d5b4b4a531e408fbaa5a9a7a523a749638764)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 0fb5af564b9b91cd9412f10f5f8e2e1377c73eab)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 967d34815c92308fb74f6ac2965b1be807c17353
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jun 21 08:28:08 2018 +0100
Bug 20879: Fix regression in shibboleth when ldap enabled
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit c528c05f303d1d4c99680ebf61fb78a79b92bedf)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 9f59f945073334daff0339c0e24a7e8641de9e6b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 0c56d4e0f3112557c484954491e990c1d39abbd3
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Dec 13 13:27:36 2017 +0000
Bug 18947: LDAP - do not assume anonymous bind if no user or password
To test:
Ideally tested on a working ldap server with bind by auth and no
anonymous bind
1 - Define an LDAP config with bind by auth
2 - Don't define user/pass
3 - Define anonymous_bind = 0
4 - Attempt bind by auth
5 - Error is something like:
LDAP search failed to return object : XXXXXXXXX: LdapErr: XXXX-XXXXXX,
comment: In order to perform this operation a successful bind must
be completed on the connection., data 0, v2580 at
/usr/share/koha/lib/C4/Auth_with_ldap.pm line 102.
6 - Define user/pass
7 - Now bind by auth should work
8 - remove user/pass
9 - Apply patch
10 - Attempt again
11 - Bind by auth shoudl succeed
prove -v t/db_dependent/Auth_with_ldap.t
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 8eed0466381435a0426fe9c2ea75fa295d906533)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 2cb4bbd8baba9df1177fb965619df0328263541f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 7b5968612d251c0a40e06f4bed1a99fa951d2b23)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b535a0da267c3b1dd4e833a0af3bae48d28879e9
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Fri Jun 22 15:02:01 2018 +0100
Bug 20972: Add a testcase for bug 20972
Ensure all 10 characters of ISBN are preserved
And that ISBNs and EANs are correctly identidied in the PIA segment
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 82ce10dd2817e99aa138d87287d903e5c7539a0a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e2fbce6c719eaa4dbfffe0eb7ed0dd6a142df96d)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 549148d74b6368697e216a31c39296016668a8d1
Author: xljoha <johan.larsson at ub.gu.se>
Date: Thu Jun 21 09:58:55 2018 +0200
Bug 20972: If ISBN has 10 numbers only the first 9 numbers are used
If ISBN has 10 numbers only the first 9 numbers are being added to the Edifact-message (PIA+5+3540556753:IB')
This is caused by wrong positioning of capturing parentheses in a regular expression.
Sponsored-by: Gothenburg University Library
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit b9bd93e9205d4b8344a77214fefb8efe2c84792e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 7a14e9d6e477c0c3904df099e11afbf15fdee701)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 8b8b5061b49953e876a145ed22a971858b7842c1
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jan 17 19:50:31 2018 +0000
Bug 20014: Preselect item budget based on id not code
To test:
1 - Have the same fund code in two budgets
2 - Have budget code defined in MarcItemFieldsToOrder
3 - Stage a file with some order items as defined above
4 - Inspect the fuinds drop down in the item, notice two lines are
marked selected
5 - Apply patch
6 - Repeat
7 - Only one field should be selected, with a preference for active
budget
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d1890533c8796873149338831c5de13d5b19cb9e)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 41b67901d2a6f46452d590916a0cb57f29a69496)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit bff9e80adfa7692963a564c5c35c507d81e1f34b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 2 +-
C4/Auth_with_ldap.pm | 9 ++--
C4/ILSDI/Services.pm | 7 ++-
C4/Installer/PerlDependencies.pm | 5 ++
C4/Reserves.pm | 11 ++++
Koha.pm | 2 +-
Koha/Edifact/Order.pm | 2 +-
Koha/Patron/Discharge.pm | 1 +
acqui/addorderiso2709.pl | 9 +++-
debian/control | 2 +
installer/data/mysql/updatedatabase.pl | 11 ++++
.../prog/en/modules/acqui/addorderiso2709.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 1 -
members/printfeercpt.pl | 6 ---
misc/migration_tools/bulkmarcimport.pl | 13 +++--
opac/opac-reserve.pl | 8 ---
opac/tracklinks.pl | 5 +-
reserve/placerequest.pl | 12 -----
t/Ediorder.t | 13 ++++-
t/db_dependent/Auth_with_ldap.t | 25 +++++++--
t/db_dependent/ILSDI_Services.t | 35 ++++++++----
t/db_dependent/Reserves.t | 56 +++++++++++++++++++-
22 files changed, 178 insertions(+), 59 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list