[koha-commits] main Koha release repository branch 16.05.x updated. v16.05.02-01-27-gfbb6ecc
Git repo owner
gitmaster at git.koha-community.org
Fri Aug 5 08:54:57 CEST 2016
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 fbb6eccabab6fa65bab8d03e4be444e4029faa7c (commit)
via ad5acf73bc03f2a68ebbaa27c3d9399ce38551ae (commit)
via 241c64434855980b46b1dd9f347c9b2e45adf2e4 (commit)
via 536acf312012b29df27191683a313d097b176c1e (commit)
via df0efd70da3486969b0601a5d3018f2f8cd49a52 (commit)
via 0c5c0a50b87ceeaa8f76e18240e279a96596222a (commit)
via f55ac205bfc2c5f68fb173eaf6af45939de72639 (commit)
via bb5adfa7f959d80dd079b058ec67f0d3fc276d09 (commit)
via 3e37c9db1760137bfc8a575590125c7d1b6aefa4 (commit)
via 1cf1c89f304fd2d84a1264041e8834444d1c8bf3 (commit)
via b505c6b7d636f262eadef82984b83b5194438724 (commit)
via 3810c29f61ebcd815066f1be2abc08cbb2bdc0aa (commit)
via 46322ffc6e683d0583283e7485548d46c9586019 (commit)
via 7cb27f092a4c699fcd428083383eef6f515da3e3 (commit)
via 98c6d7873535d52609657ecaf256740c95c0e532 (commit)
via 24664b719f9d09210f30d7f96fc025e08da8124e (commit)
via ec78a0d43fe8032d9eeb9272878129085c3c429f (commit)
via 542c0dbbaa8bff5a101058e0e2397e21edf8f192 (commit)
via 46e4f196bb4d3e00abfc43d335b7ca9024aa829c (commit)
via 70f48519f024e26157ebae4e7c0e028fa9b4d43a (commit)
via 32833f95dbf8fd2559b2da4146b30e850182ee0f (commit)
via c0e2610bda62b3890fd5416124bc9c1157c23d4d (commit)
via b765cd3e31d2c0c504f56589a49706106f6b304e (commit)
via d2b20b2a82ef73423ec6571967173083ba333501 (commit)
via ce68d9b7fd14f9959f18039b63ad3e7bea44213e (commit)
via 8955b1b7c56ebbcf350a57e3a794597e0ac2d70c (commit)
via 58bd47a462a008f2e5cb9cfa221ee5b0a0bd5826 (commit)
from 27cd564c20ffede4a7e7fdef332c457389e94240 (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 fbb6eccabab6fa65bab8d03e4be444e4029faa7c
Author: Nicole C Engard <nengard at bywatersolutions.com>
Date: Wed Jul 27 13:27:37 2016 +0000
Bug 16727: Clarify upload category note
This patch clarifies the note on the upload tool
that states that no categories are defined.
To test:
* Log in to Koha
* Confirm that you have no values set for the UPLOAD
authorized value category
* Visit Tools > Upload
* Check the warning note for typos
* Add a authorized value category for UPLOAD
* Visit Tools > Upload
* Confirm that note is replaced
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit ebaa3543d6278fe31886310cda5b10c807e6ad8a)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit ad5acf73bc03f2a68ebbaa27c3d9399ce38551ae
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Jul 6 14:17:20 2016 -0400
Bug 16864: Silence warnings in t/db_dependent/ILSDI_Services.t
prove t/db_dependent/ILSDI_Services.t
generates noisy output as a result of the ambiguous context
of two $cgi->param() calls.
By storing into scalar variables, and then using the scalar
variables, the code maintains readability and fixes the problem.
TEST PLAN
---------
1) prove t/db_dependent/ILSDI_Services.t
-- noisy.
2) apply patch
3) prove t/db_dependent/ILSDI_Services.t
-- not noisy
4) run koha qa test tools
Signed-off-by: Marc <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit ef0738922005e4235b80e70663d7fa711a87556e)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 241c64434855980b46b1dd9f347c9b2e45adf2e4
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Jul 6 21:37:21 2016 -0400
Bug 16868: Silence error t/db_dependent/Linker_FirstMatch.t
When the auth_header table has records which exclude 1xx and
2xx tags, the $bibfield doesn't match anything. This in turn
sets it to undef, which triggers an error on the next line
killing the test.
This was completely refactored to provide the data necessary
for the tests to pass, and to be more comprehensive (both MARC
and UNIMARC are tested). The tests are then run.
C4::Headings::authorities is mocked, so that this test is not
dependent on a search engine.
TEST PLAN
---------
1) back up DB
2) DELETE FROM auth_header;
3) SOURCE auth_header.sql;
-- the provided file
4) prove t/db_dependent/Linker_FirstMatch.t
-- should barf before running all the tests
5) apply all patches
6) prove t/db_dependent/Linker_FirstMatch.t
-- should work happy
7) run koha qa test tools
8) restore your backup
Followed test plan, behaves as expected.
Signed-off-by: Marc <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 1be7fb5e12f0dd3911bb182ef2c0740c481337ec)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 536acf312012b29df27191683a313d097b176c1e
Author: Marc Véron <veron at veron.ch>
Date: Tue Jul 5 07:14:26 2016 +0200
Bug 16871: Translatability: Avoid [%%-problem and fix related sentence splitting in catalogue/detail.tt
In koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt,
fix line splitted TT directives and sentence splitting leading
to translatability problems. (See first comment).
To test:
- Apply patch
- Go to detail pages of biblios with waiting holds
- Verify that messages in column 'Status' are OK
- Examine code in patch to make sure that the simplification in logic
makes sense and that no TT directive is splitted
- Bonus test:
- Go to folder misc/translator. Run perl translate create xx-XX
- Verify that monster mentioned in first comment no longer exists
(in po/xx-XX-staff-prog.po)
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised
Amended for wording (comment #5) 2016-07-26 mv
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 13004a8c649f1098f1ddd3be5a02b75bad27f3d8)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit df0efd70da3486969b0601a5d3018f2f8cd49a52
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 22 11:48:21 2016 +0200
Bug 16971: Missing dependency for HTML::Entities
This module is already used in opac-password-recovery.pl.
It is loaded in Acquisition, but not used (anymore?).
It is not yet listed in PerlDependencies.
Note: The module is packaged for Debian Wheezy and Jessie.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 92626f55c88661d1e5b8dea57bdca412df004123)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 0c5c0a50b87ceeaa8f76e18240e279a96596222a
Author: Jesse Weaver <jweaver at bywatersolutions.com>
Date: Fri Jul 8 16:01:19 2016 -0600
Bug 16818: External auth redirect broken under Plack
Test plan:
0) Have either CAS or Shibboleth authentication enabled under Plack.
1) Hover over the authentication link on the staff client or OPAC, and
notice that it has either '.../opac/...' or '.../intranet/...' instead
of '.../cgi-bin/koha/...'. (This will be a complete dealbreaker for CAS
authentication.)
2) Apply patch.
3) Check links again; they should now have the correct paths.
Signed-off-by: Matthias Meusburger <matthias.meusburger at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Did not test CAS or Shibboleth, but no regression found.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit d475dae77313e8f0ee11146ce824d019351cbc5f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit f55ac205bfc2c5f68fb173eaf6af45939de72639
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Fri Jun 24 11:53:02 2016 +0000
Bug 11490 - DBRev 16.05.02.002
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit bb5adfa7f959d80dd079b058ec67f0d3fc276d09
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 11 14:10:49 2016 +0100
Bug 11490: Split MaxItemsForBatch into 2 prefs to clarify things
Prior to this patch, a single pref (MaxItemsForBatch) was used to
restrict the use of the batch item modification and deletion.
On the batch modification tool, the pref is used to limit the number of
items a librarian is allowed to modify in a batch, but on the batch
deletion tool the pref is used to limit the number of items to display.
To clarify things, this patch split the pref into 2 new prefs:
MaxItemsToDisplayForBatchDel and MaxItemsToProcessForBatchMod.
Later we could add a MaxItemsToProcessForBatchDel if needed.
Note that this patch should not introduce any changes in the current behaviors.
Test plan:
0/ Do not execute the update DB entry
1/ Set a value != 1000 for MaxItemsForBatch
2/ Execute the update DB entry and confirm that the 2 new prefs are
initially set with the value of MaxItemsForBatch and that
MaxItemsForBatch has been deleted
3/ Set different values for these 2 prefs (2 and 3 for instance to ease
the next steps)
4/ Try to delete less than MaxItemsToDisplayForBatchDel items
=> You must see the items details
5/ Try to delete more than MaxItemsToDisplayForBatchDel items
=> You must not see the items details but are allowed to delete them
6/ Try to modify less than MaxItemsToProcessForBatchMod items
=> You must see the items details
7/ Try to modify more than MaxItemsToProcessForBatchMod items
=> You must be restricted and not allowed to process
Signed-off-by: Laurence Rault <laurence.rault at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 6b2c55ecdd7ad128c7ec923e70b13b1f287c7d00)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3e37c9db1760137bfc8a575590125c7d1b6aefa4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 11 14:10:41 2016 +0100
Bug 11490: Add prefs MaxItemsToProcessForBatchMod and MaxItemsToDisplayForBatchDel
Signed-off-by: Laurence Rault <laurence.rault at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 20f42350488ccd2795af3863ab1954d22b92eeae)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 1cf1c89f304fd2d84a1264041e8834444d1c8bf3
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Jul 26 08:57:50 2016 +1200
Bug 16975 : @INC should not have '.' as its last entry
To Test
1/ Try using a plugin
2/ Apply patch
3/ Test plugin still works
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 28eae42d2d09c14d0bb1bd3e1655714b33711ab3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit b505c6b7d636f262eadef82984b83b5194438724
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 22 08:30:54 2016 +0100
Bug 16878: Fix XSS in opac-memberentry
The vars are gotten from the url and sent to the template as it. They
must be escaped.
Test plan:
I have not managed to create the original issue, so there is no test
plan for the XSS fix, but you can confirm there is no regression.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 9bdea2e3691fd62e777cc974f89b867a69eec9a8)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3810c29f61ebcd815066f1be2abc08cbb2bdc0aa
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jul 27 18:00:53 2016 +0000
Bug 16988 - Suspending a hold with AutoResumeSuspendedHolds disabled results in error
iUnless AutoResumeSuspendedHolds is enabled, attempting to suspend a
hold from reserve/request.pl results in the following error:
The given date (undefined) does not match the date format (us) at
/home/vagrant/kohaclone/Koha/DateUtils.pm line 152.
Test Plan:
1) Enable SuspendHoldsIntranet
2) Disable AutoResumeSuspendedHolds
3) Attempt to suspend or unsuspend a hold
4) Note the error
5) Apply this patch
6) Repeat step 3
7) The hold should suspend or resume correctly
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Megan Wianecki <mwianecki at mtpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 91bc9451d0378d65100c828776b09395e4c88199)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 46322ffc6e683d0583283e7485548d46c9586019
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 14:00:02 2016 +0100
Bug 17022: Fix XSS in circ/branchtransfers.pl
Test plan:
Enter the following in the barcode input:
<script>alert('XSS')</script>
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit c63d0b311b5e7ba882d19b9b8a71838256de98cf)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 7cb27f092a4c699fcd428083383eef6f515da3e3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 14:15:09 2016 +0100
Bug 17023: Fix XSS in acqui/z3950_search.pl
Test plan:
Enter the following in the different inputs:
<script>alert('XSS')</script>
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit eb543a90848b97d35aa15052c8881134926a3ed0)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 98c6d7873535d52609657ecaf256740c95c0e532
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 14:06:41 2016 +0100
Bug 17023: Fix XSS in cataloguing/z3950_search.pl
Test plan:
Enter the following in the different inputs:
<script>alert('XSS')</script>
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit f6e0a619d974fe002ec6a920206c7bc2808bce26)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 24664b719f9d09210f30d7f96fc025e08da8124e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 14:32:46 2016 +0100
Bug 17024: Fix XSS in tools/viewlog.pl
Test plan:
Hit /tools/viewlog.pl?do_it=1&modules=CATALOGUING&action=MODIFY&object=<script>alert("XSS")</script>
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit f563ba795e4863328ff4930e7877caae9458206c)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit ec78a0d43fe8032d9eeb9272878129085c3c429f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 14:51:49 2016 +0100
Bug 17026: Fix XSS in serials/checkexpiration.pl
Test plan:
Hit:
/serials/checkexpiration.pl?title="><script>alert("XSS")</script>&date=12/02/2002
/serials/checkexpiration.pl?issn="><script>alert("XSS")</script>&date=12/02/2002
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 9d00353a92487dcde654d88206fd5458448fff1b)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 542c0dbbaa8bff5a101058e0e2397e21edf8f192
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 15:41:49 2016 +0100
Bug 17028: Fix XSS in reserve/request.pl
Test plan:
Hit
/cgi-bin/koha/reserve/request.pl?biblionumber=1"><script type="text/javascript">alert("XSS")</script>
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 66f81fc2101f194d39592bc28f3e2ff69764bc00)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 46e4f196bb4d3e00abfc43d335b7ca9024aa829c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jul 6 12:50:08 2016 +0000
Bug 16436 [QA Followup] - Use debug instead of info
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 bcf7268f4f37ead02db8bc2da457ddfc9ce425c0)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 70f48519f024e26157ebae4e7c0e028fa9b4d43a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue May 3 18:58:57 2016 +0000
Bug 16436 - Allow action logs to be logged to the koha log file
Test Plan:
1) Ensure that your Koha::Logger configuration is in good working order
2) Apply this patch
3) Modify the first line of your log4perl.conf file from:
log4perl.logger.intranet = WARN, INTRANET
to
log4perl.logger.intranet = INFO, INTRANET
4) Change a system preference setting
5) Note the new line in your log file!
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ce8c55fba055e856af406587894c6d67c68bc681)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 32833f95dbf8fd2559b2da4146b30e850182ee0f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Apr 20 10:29:03 2016 -0400
Bug 16310 - Remove the use of "onclick" from audio alerts template
This patch removes one use of "onclick" in favor of defining events in
the JavaScript.
This patch also makes changes to the style of some buttons to make the
interface a little more consistent with current practices.
To test, apply the patch and go to Administration -> Audio alerts.
- In the list of existing audio alerts, click the "Edit" button for any
alert. The correct data should be loaded in the edit form.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit fcd139b22239206142809993cf9e328a3cdce38d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c0e2610bda62b3890fd5416124bc9c1157c23d4d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu May 19 13:28:02 2016 +0000
Bug 15397 - Pay selected does not works as expected
When patron has more fees (account lines) and you wan't to pay just some
of them, you select wanted lines a click on "pay selected" button. But
the fine isn't paid, the "amountoutstandig" is not modified, but it is
added new line with "pay" code an with amountoutstanding below zero.
Paying one or all fine works as expected. Paying selected worked some
time ago, but I don't know when it stopped working, we realize it after
upgrade to 3.22.
Test Plan:
1) Apply this patch
2) Pay fines using "Pay selected"
3) Note the payment and the fees outstanding balances are reduced!
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 537adde2d2f65ed9bb9a03a127b9906930d46353)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit b765cd3e31d2c0c504f56589a49706106f6b304e
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Mon Aug 1 09:54:30 2016 +0000
Bug 16573 - DBRev 16.05.02.001
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit d2b20b2a82ef73423ec6571967173083ba333501
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 22 09:51:00 2016 +0100
Bug 16573: Define virtualshelves.created_on as datetime for existing installs
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 44785935bd45291a2ae36a5c9ab65b1e6cf69c5b)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit ce68d9b7fd14f9959f18039b63ad3e7bea44213e
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Tue May 24 18:12:11 2016 -0300
Bug 16573: change created_on type - atomic update
This patch change 'created_on' virtualshelves column to
datetime type
To test:
1) Apply the patch
2) Run updatedatabase.pl
3) Verify type of 'created_on' column
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 162b9015d9bfb23200d1bddff69be9384a33463b)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 8955b1b7c56ebbcf350a57e3a794597e0ac2d70c
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Mon May 23 17:06:01 2016 -0300
Bug 16573: fix structure and sample data for MySQL 5.7
Web install on Ubuntu 16.04/Mysql 5.7 fails.
This patch makes small changes to make installation
possible to kohastructure.sql and some sample files.
Sample values for quotes table can't have '0000-00-00 ...' values
nor NULL values, now() is perhaps an option.
Depends on Bug 16572
To test:
1) System with MySQL 5.7, for example Ubuntu 16.05
2) Apply 16572
3) Try web install, it fails
4) Apply this and next patch
5) Try again, now it succeed
This is only for English install, i18n files needs revision
I can do that if this is accepted.
Perphaps a change is needed to updatedatabase.pl
Ammended patch, 'created_on' field on virtualshelves
can't be timestamp default null, mysql 5.5 complains
that only one timestamp column can be defined as
default not null. Changed to 'datetime' type.
Can provide followup with updatedabase change,
but need an opinion if this type change makes sense.
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 36b2b288a7b8a39530f0a1ba7a00396206640533)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 58bd47a462a008f2e5cb9cfa221ee5b0a0bd5826
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Mon May 23 16:58:03 2016 -0300
Bug 16573: fix linkid value on marc_subfield_structure
followup to previous patch.
This patch fixes linkid value. It was set to '', but
declared as tinyint.
Mysql < 5.7 replaced this with nearest right value, i.e 0
Mysql 5.7 gives error here.
Also some normalization, all lines with data begins with two tabs
To test:
On top of Bug 16572 and previous patch
1) Run webinstaller
2) Add mandatory values
3) There must be no problems on MySQL 5.7
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 d00d46112df2dc1c3f823fbc2a8c347deb69cdb7)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 2 +-
C4/Acquisition.pm | 1 -
C4/Auth.pm | 24 +-
C4/Auth_with_cas.pm | 3 +-
C4/Auth_with_shibboleth.pm | 3 +-
C4/ILSDI/Services.pm | 4 +-
C4/Installer/PerlDependencies.pm | 5 +
C4/Log.pm | 39 +-
Koha.pm | 2 +-
Koha/AuthUtils.pm | 22 +-
Koha/Plugins.pm | 1 +
Koha/Plugins/Handler.pm | 1 +
.../marc21/mandatory/authorities_normal_marc21.sql | 3384 ++++++++++----------
.../data/mysql/en/optional/sample_patrons.sql | 3 +-
installer/data/mysql/en/optional/sample_quotes.sql | 62 +-
installer/data/mysql/kohastructure.sql | 4 +-
installer/data/mysql/sysprefs.sql | 3 +-
installer/data/mysql/updatedatabase.pl | 31 +-
.../prog/en/includes/biblio-view-menu.inc | 20 +-
.../prog/en/modules/acqui/z3950_search.tt | 56 +-
.../prog/en/modules/admin/audio_alerts.tt | 5 +-
.../prog/en/modules/admin/preferences/tools.pref | 11 +-
.../prog/en/modules/catalogue/detail.tt | 30 +-
.../prog/en/modules/cataloguing/z3950_search.tt | 58 +-
.../prog/en/modules/circ/branchtransfers.tt | 6 +-
.../prog/en/modules/reserve/request.tt | 8 +-
.../prog/en/modules/serials/checkexpiration.tt | 8 +-
.../prog/en/modules/tools/batchMod-edit.tt | 3 +-
.../intranet-tmpl/prog/en/modules/tools/upload.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 16 +-
koha-tmpl/intranet-tmpl/prog/js/audio_alerts.js | 10 +
opac/opac-memberentry.pl | 4 +-
reserve/request.pl | 1 +
t/db_dependent/Linker_FirstMatch.t | 155 +-
tools/batchMod.pl | 9 +-
35 files changed, 2077 insertions(+), 1919 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list