[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.10-24-ge838b37
Git repo owner
gitmaster at git.koha-community.org
Sat Sep 14 00:12:36 CEST 2013
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, 3.10.x has been updated
via e838b37cfa9229ef20f769dab083918d9d362b1b (commit)
via 4e474580b16024d6a6afc36bf220ebab034cb26a (commit)
via 0a47d3444dfa749f5b9c99252cd129bc80cee54a (commit)
via fb7c0d5a1afe23b2c7e1ebe09f48b522ac6821c5 (commit)
via 5c32b6e383f02a81e8eed8d5462b0a8119696903 (commit)
via b976a45151d93e311cf375739ffe717143e99706 (commit)
via 0a8c7c0634d7ceae09b58d2711690504258009ab (commit)
via eaefa5daf65161c9f7c99ab1340bbc97075450e6 (commit)
via e0e2a2e87635834cc77f94b5e8b7edb100e60d70 (commit)
via e1227835ad9c2eaf71c8794b91ba3a921ee7f3b8 (commit)
via d5957dfe50e1cfac199c4355722ac7384d227fbf (commit)
from 3dec7977189b7b8549128e4fec151b7a654d2a3a (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 e838b37cfa9229ef20f769dab083918d9d362b1b
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Mon Aug 12 16:15:37 2013 +0100
Bug 10712: Save missing config variables to install log
The variables for AUTH_INDEX_MODE and ZEBRA_TOKENIZER were not
being saved to the koha_install_log file. As a result when using the
--prev-install-log option in Makefile.PL the user was still prompted
to select them.
This patch adds the appropriate variables to the list saved in
the install log.
To test:
On a (non-package) system installed/upgraded without the patch running
'perl Makefile.PL --prev-install-log /path/to/koha-install-log' will
still prompt you to choose authorities indexing mode and select
between chr and icu, after upgrading with this patch applied the same
command should get the responses from the install log and not require
user intervention.
The values can be seen written into misc/koha-install-log
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 40e6f6a8f22b8af7adef79a0ece80a61a69ccc50)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 521d260a5931119c688fd872c30041ffe1c5c692)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 521d260a5931119c688fd872c30041ffe1c5c692)
commit 4e474580b16024d6a6afc36bf220ebab034cb26a
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Aug 9 18:53:20 2013 +0000
Bug 10644: (follow-up) remove inadvertant dependence on Perl 5.14
Perl 5.14 changed array and hash container functions (e.g., keys())
to accept hashrefs or arrayrefs. However, this doesn't work in
Perl 5.10, so doing
scalar(keys( function_returning_hashref() ) );
is a syntax error in that version. This patch changes the affected
tests to explicitly difference the hashrefs returned by the various
functions.
To test:
Verify that t/db_dependent/ClassSource.t passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 8f933bc040e8e4198f5278253191a7a4233467ce)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 9504e00f7b497aa8e49567ca99cf73f7c32ad134)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 9504e00f7b497aa8e49567ca99cf73f7c32ad134)
commit 0a47d3444dfa749f5b9c99252cd129bc80cee54a
Author: root <root at kenza-VirtualBox>
Date: Thu Jul 25 14:03:32 2013 +0200
Bug 10643: fix inappropriate uses of $sth->finish() in C4::ClassSource.pm
This patch gets rid of finish() and replace prepare_cached by prepare.
From the man page
finish()
Indicate that no more data will be fetched from this statement handle
before it is either executed again or destroyed.
You almost certainly do not need to call this method.
Adding calls to "finish" after loop that fetches all rows is a common
mistake, don't do it, it can mask genuine problems like uncaught fetch errors.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 5cba6457aa00f3f3b2038f70057df300d9c6b9c3)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit cfb48010ad23e50fc93d893963164a17d4208c7b)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit cfb48010ad23e50fc93d893963164a17d4208c7b)
commit fb7c0d5a1afe23b2c7e1ebe09f48b522ac6821c5
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Jul 31 11:39:45 2013 +0200
Bug 10666: avoid random failures of Daily quotes tests
In t/db_dependent/Koha.t, the test "Got a quote based on today's
date" is failing :
$prove t/db_dependent/Koha.t :
t/db_dependent/Koha.t .. 1/6
# Failed test 'Got a quote based on today's date.'
# at t/db_dependent/Koha.t line 126.
# Compared $data->{"source"}
# got : 'Herbert Hoover'
# expect : 'Abraham Lincoln'
# Be sure to run this test on a clean install of sample data.
# Looks like you failed 1 test of 4.
Looks like the wrong quote is returned by GetDailyQuote().
I'm using a databased created with the English sample SQL datas.
I think I found the cause :
The test "Got a random quote." calls GetDailyQuote('random'=>1) which
changes the quote timestamp to now. When then testing GetDailyQuote(),
this quote (which may not be the one created by test) is the most
recent quote.
This patch moves the "Got a random quote." test after "Got a quote
based on today's date" to solve the problem.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b874f7d63894693c9c3f2a3d93ee119bc3b01486)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit a37558cd6087a1945611161b09e923f79b60d6e1)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit a37558cd6087a1945611161b09e923f79b60d6e1)
commit 5c32b6e383f02a81e8eed8d5462b0a8119696903
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Aug 1 15:09:39 2013 +0000
Bug 10644: fix typos in test descriptions
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit d9d8a8424dcd62988293920f7c67f7d0a01efc70)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 7e5c0a9a5f08e325e2e8a1fdb2fda72b76a3b1e9)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 7e5c0a9a5f08e325e2e8a1fdb2fda72b76a3b1e9)
commit b976a45151d93e311cf375739ffe717143e99706
Author: Kenza Zaki <kenza.zaki at biblibre.com>
Date: Fri Jul 26 09:55:43 2013 +0200
Bug 10644: add unit tests for ClassSource.pm
The tests are wrapped in a database transaction.
To test:
prove t/db_dependent/ClassSource.t
t/db_dependent/ClassSource.t .. 1/24 prepare_cached(SELECT * FROM `class_sort_rules` WHERE `class_sort_rule` = ?) statement handle DBI::st=HASH(0x92dbedc) still Active at C4/ClassSource.pm line 249
prepare_cached(SELECT * FROM `class_sources` WHERE cn_source = ?) statement handle DBI::st=HASH(0x926876c) still Active at C4/ClassSource.pm line 137
attempting to use non-existent class sorting routine routine1
prepare_cached(SELECT * FROM `class_sort_rules` WHERE `class_sort_rule` = ?) statement handle DBI::st=HASH(0x92dbedc) still Active at C4/ClassSource.pm line 249
prepare_cached(SELECT * FROM `class_sources` WHERE cn_source = ?) statement handle DBI::st=HASH(0x926876c) still Active at C4/ClassSource.pm line 137
t/db_dependent/ClassSource.t .. ok
All tests successful.
Files=1, Tests=24, 0 wallclock secs ( 0.02 usr 0.00 sys + 0.12 cusr 0.01 csys = 0.15 CPU)
Result: PASS
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 5de06b87e29f12250a35df3239372a7ed0754811)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit aeb11a6a9236bcf7f6c822a55e3d270406956db2)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit aeb11a6a9236bcf7f6c822a55e3d270406956db2)
commit 0a8c7c0634d7ceae09b58d2711690504258009ab
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jun 13 09:46:43 2013 -0400
Bug 10463: ensure that Quote of the Day feature selects random quotes
When the Quote of the Day tool selects a new new quote, it updates the
timestamp and does not take the timezone into account. Thus the time is
set to +4 hours (e.g. 2013-06-11 13:33:48 when the time is 2013-06-11
09:33:48). It then repeats the same quote every day.
To replicate:
Set Administration >> System preferences >> OPAC preferences >> Features
>> QuoteOfTheDay to Enable
In Home >> Tools >> Quote Editor, add several quotes.
In the opac, refresh the home page. You should get a quote of the day at
the top.
mysql> select * from quotes;
Note the timestamp of the quote selected by the tool. It will not match
the date on the machine (unless your server's timezone is set to UTC).
If you change the date to the previous date and refresh the opac, the
tool wlill select another quote, which will not change unless forced.
Test Plan:
1) Remove all your quotes and import a fresh set
2) Enable the quote of the day and view the opac
3) Look at your quotes table and note the timestamp is incorrect
4) Repeat steps 1 and 2
5) Look at your quotes table and note the timestamp is now correct
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit def952bda9cd72a4f6916e93ad1c454a04a3cb43)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit f2ccae0ded3c9f099ba9eecfdf72b18c6cd8e797)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit f2ccae0ded3c9f099ba9eecfdf72b18c6cd8e797)
commit eaefa5daf65161c9f7c99ab1340bbc97075450e6
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Tue Jul 23 23:24:11 2013 +0200
Bug 10621: use correct from-address for subscription alert emails
From-address and to-address were the same (patron's email) for
subscription alerts. This patch changes 'from' the branch or
kohaadminemailaddress
To test
- add a subscription in staff/serials in case you don't have any
- enable patron notifications or the subscription
- in the OPAC, subscribe to the serial
- in staff/serial, receive an issue of the serial
Before applying the patch, the email that is supposed to be sent
has the patron's email as 'from' and 'to' (and is likely to fail).
If you follow the steps after applying the patch, the email alert
should have the 'from' address of the patron's branch or
kohaadminemiladdress -- which should also work fine with the MTA/SMTP
you have set up for messaging.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 61fa246ac06d637d50c8eed68244f0577ed34e4d)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 75b31bb5cf4a6269dedeb95be374b654fe4b5091)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 75b31bb5cf4a6269dedeb95be374b654fe4b5091)
commit e0e2a2e87635834cc77f94b5e8b7edb100e60d70
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Jul 21 11:50:09 2013 +0200
Bug 10516 - Follow up - Fixing capitalization
Fix capitalization on submit buttons when deleting
a Z39.50 server.
- Delete this Server
- Do Not Delete
I think the "Do not delete" should maybe even be a cancel
link to be more consistent with how Koha displays this
kind of dialog in other places.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
fixes capitalisation, tool stil works
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit c5cc04ef3d5e50c376e37a1493926181389efa6a)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 14a4abebed9df1acc67a08685be368e060a2d310)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 14a4abebed9df1acc67a08685be368e060a2d310)
commit e1227835ad9c2eaf71c8794b91ba3a921ee7f3b8
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jun 28 15:10:14 2013 -0400
Bug 10516 - Improve titles, breadcrumbs, and confirmation messages for Z39.50 server adds and updates
The template for adding/editing Z39.50 servers shows the same title,
breadcrumbs, etc. for add and edit operations. This patch creates
separate text for each case.
To test, try both adding and editing a Z39.50 server. The page title,
breadcrumb, and heading should correctly reflect the operation you
perform.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely and all strings are translatable.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 5c60ae40f97d9c22504c2942a00a93777984c7a5)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 1d7490b6e50d0cdfd08124f5ca46eca4547d5ca6)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 1d7490b6e50d0cdfd08124f5ca46eca4547d5ca6)
commit d5957dfe50e1cfac199c4355722ac7384d227fbf
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jul 11 10:53:06 2013 -0400
Bug 10576: make strings in additem.js accessible to translation
There are a couple of untranslatable strings in additem.js. This patch
moves the strings out of the script and into the include file which has
been created for this purpose.
To test, apply the patch and test the process for adding an item to an
existing or new basket (with AcqCreateItem set to "when placing an
order."
The add item form should be correctly labeled "Add item." After adding
an item, click to edit it again. The form should now be labeled "Update
item."
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely and passes all tests.
Made sure strings can be translated testing with German templates.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b7305e4876e6d961e8325155d679b1312975e74d)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit ccd824532156eff6a97135a4e8cc766f3d7df894)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit ccd824532156eff6a97135a4e8cc766f3d7df894)
-----------------------------------------------------------------------
Summary of changes:
C4/ClassSource.pm | 33 +---
C4/Koha.pm | 7 +-
C4/Letters.pm | 3 +-
admin/z3950servers.pl | 3 +-
.../intranet-tmpl/prog/en/includes/additem.js.inc | 2 +
koha-tmpl/intranet-tmpl/prog/en/js/additem.js | 5 +-
.../prog/en/modules/admin/z3950servers.tt | 18 ++-
misc/koha-install-log | 2 +
rewrite-config.PL | 1 +
t/db_dependent/ClassSource.t | 197 ++++++++++++++++++++
t/db_dependent/Koha.t | 10 +-
11 files changed, 243 insertions(+), 38 deletions(-)
create mode 100644 t/db_dependent/ClassSource.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list