[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.11-14-g8b9759e
Git repo owner
gitmaster at git.koha-community.org
Sat Oct 12 17:55:16 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 8b9759e6574132b3b87e6a4a4ad768fc6621087d (commit)
via e581785e64e94346febc692dec7a487f588b2b54 (commit)
via 88ca0f5d686c3bb8195cd29e8b18564508c58872 (commit)
via 2fc0e258ea349cb574091b0b677d1808e87a4ecc (commit)
via b3ba600934b03eaf3ae870084d36a2ed4c205224 (commit)
via 8b987317d9f886ebe11cb05f4f3884929edffe53 (commit)
via 6a84e8d4120458b5688299e601c2f637f79c7f07 (commit)
via 335dcffba7bd2a694d3893a3aa9ed2f017768340 (commit)
via 11c0251aa490e31ae3731080a66586c0d997cf23 (commit)
via b86da7f924e81cb3f233582f362170810cec6c6a (commit)
via e02ee046bfc78566a1f048a414fbc6bc4babddee (commit)
via c2b86366e342fef07f2e2b3212800888803f5378 (commit)
via fd8418bc0df27c0863dcf0a59ceb2fed7d3b9d69 (commit)
via 98c0bce2778197f17ef096c3e48572edb9361f9f (commit)
from 107d3d8d268520c1095160b528497db7a59b6cb6 (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 8b9759e6574132b3b87e6a4a4ad768fc6621087d
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Wed Aug 14 15:51:10 2013 +0200
Bug 10727: Replace carriage return with <br /> when printing hold notices
This patch replaces carriage return with <br /> in the content of
hold notices for printing. This is necessary to convert html file
into well formatted pdf file.
Test plan :
- check in an item reserved by a borrower
that has not activated email notification
- verify in message_queue table that you've got a
new HOLD_PRINT notice with status 'pending'
- run gather_print_notices.pl <directory>
Without the patch, the script generates a html file without <br /> tags.
If you run printoverdues.sh <directory>, the text in the resulting PDF
file is all on one line
With the patch, the script generates a html file with <br/> tags and
the PDF file created by printoverdues.sh is well formatted.
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 30b32d99381a8296e41e6843c440cd9e3594eb8a)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit c806cc8e1998bd9c134f9839f7975d1fffbceef3)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit c806cc8e1998bd9c134f9839f7975d1fffbceef3)
commit e581785e64e94346febc692dec7a487f588b2b54
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Thu Jul 11 23:58:34 2013 +1200
Bug 10574 - mute the "upgrading from 3.2" message
New installs get the message about running a script if upgrading from
3.2. They shouldn't. This silences this message in all cases except when
you actually are upgrading from 3.2.
Test plan:
There are three scenarios to test:
1) A fresh install should not cause the prompt.
2) An upgrade with or without the debconf entry set should not cause the
prompt.
3) An upgrade from a 3.2 release to this should cause the prompt.
To remove the debconf entry that says the prompt has been seen:
echo 'unregister koha-common/3.2-3.4-upgrade-notice' | sudo debconf-communicate koha-common
This should be run before every test to make debconf forget that it's
shown the prompt. To get its current state:
sudo debconf-show koha-common
To test against the 3.2 version, an empty package that claims to be Koha
3.2.2 is attached to the bug.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 598a830af0f97aef39bae36265c06a6f8ed73f10)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit f6d1d5cd6c4f93f6c592170f59241268dfff79cb)
commit 88ca0f5d686c3bb8195cd29e8b18564508c58872
Author: David Cook <dcook at prosentient.com.au>
Date: Wed Aug 21 12:12:36 2013 +1000
Bug 9603 - Fix layout of Patron Card Creator Layout screen for display in IE
Currently, the layout for the Edit/Add Layout screen of the Patron
Card Creator is in complete disarray, when viewed in Internet Explorer
(of any version).
The nav bar is pushed to the bottom of the page, every fieldset is
empty (as their contents have been pushed out into different parts
of the page), and the checkboxes don't work.
The cause appears to be some extraneous mark-up (a few extra fieldset
and li elements)and some missing mark-up (ol elements to wrap the list
elements, especially when nesting lists within each other and within
div elements).
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I didn't test this in IE, but changes are fixing general
problems with HTML validity.
Checking the page with the W3C validator:
Before: 27 Errors, 7 warning(s)
After: 6 Errors, 7 warning(s)
All tests and QA script pass, page looks alright.
Would be nice to see the remaining problems fixed in
a follow-up.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 76a1a00977657132180f0715d96db5702565f1bf)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 2d80d67e75ac37016f982afcbc643159ccde1e1e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 2d80d67e75ac37016f982afcbc643159ccde1e1e)
commit 2fc0e258ea349cb574091b0b677d1808e87a4ecc
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Mon Jul 15 12:14:53 2013 +0200
Bug 10588: improve selection of default branch for OPAC popular items pag
In OPAC most popular items page:
With user is logged-in his branch should be selected by default.
When a branch is manually selected and form is submitted, this branch
should be selected in results page.
When looking at HTML, you see that all options are selected in combobox.
This patch corrects by using the hidden input 'do_it' to distinguish
form display and no branch filter selected.
Test plan :
- Make sure there are issues on records created in the past 3 month
- Go to OPAC not logged-in
- Click on "Most popular"
=> You get to page with results, "All libraries" is selected
- Select a branch and submit
=> You get to page with results, the branch is selected [testing opac-topissues.inc from]
- Select a branch and perform a search that does not have results (for example an item type never issued)
=> You get to page without results, the branch is selected [testing opac-topissues.tt form]
- Log-in with a user
- Click on "Most popular"
=> You get to page with results, user's branch is selected
- Select "All libraries" and submit
=> You get to page with results, "All libraries" is selected [testing opac-topissues.inc from]
- Select "All libraries" and perform a search that does not have results (for example an item type never issued)
=> You get to page without results, "All libraries" is selected [testing opac-topissues.tt form]
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely and passes all tests.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 600e953dff44c29fe7a2996fbacbd8e57cd7eb35)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 4afc06d76a39cff5471ae3e364357019334259f4)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 4afc06d76a39cff5471ae3e364357019334259f4)
commit b3ba600934b03eaf3ae870084d36a2ed4c205224
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Aug 27 12:04:14 2013 +0200
Bug 10786: fix Javascript error on the parcel page
The include of the yui json file generates a js error: YAHOO is not
defined.
This file seems not to be in use (patches for bug 8382 remove the use).
To test:
- go on acqui/parcel.pl?invoiceid=XXX
- verify the error occurs (with firebug)
- apply this patch
- refresh the page
- verify this error does not appear anymore
- Verify there is no regression on this page
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Patch fixes the javascript error pointed out by Firebug.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit d1f8d8811b1d2d96f1b087edf42f395c89c8df0f)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 9a8d1a9b534a076087cb3463adeb83a60fe01d52)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 9a8d1a9b534a076087cb3463adeb83a60fe01d52)
commit 8b987317d9f886ebe11cb05f4f3884929edffe53
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Jun 27 15:33:46 2013 +0200
Bug 5904: make patron search autocompletion respect IndependentBranches
Test plan:
- Add a staff user foo in a library A
- Add a staff user bar in a library B
- log in as foo and try to search 'bar'
- Switch on (Prevent) the syspref IndependentBranches
- the search returns no result
- log in as a superlibrarian
- Check that you are allowed to search all patrons.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passes koha-qa.pl, works as advertised.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 6b72f249082fc6be8811c3dacec15648f7c5ccd9)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit f01248ae55beffae61f7fed36cbe046b65b96116)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit f01248ae55beffae61f7fed36cbe046b65b96116)
commit 6a84e8d4120458b5688299e601c2f637f79c7f07
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Aug 28 16:27:43 2013 +0000
Bug 7143: history.txt and about page updates
- two new developers
- releases
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Reads all ok.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit dd367efddf887e3197492f11996a36c0d6c5e4c4)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 84873c2a6b62fce594bdd8c954ed2d6880903dfb)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 84873c2a6b62fce594bdd8c954ed2d6880903dfb)
commit 335dcffba7bd2a694d3893a3aa9ed2f017768340
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Aug 6 16:00:01 2013 +0200
Bug 10690 - Warn about trailing slashes in description of OPACBaseURL and staffClientBaseURL
The descriptions for OPACBaseURL and staffClientBaseURL are not explicit
about including a trailing slash or not. This patch makes it explicit
that the trailing slash should *not* be included.
To test:
- Apply the patch
- Search for "baseurl" in the system preferences
- Check that the description of both sysprefs includes a warning about
not including a trailing slash.
- Sign off
If you want to check that the trailing slash is in fact superfluous you
can do something like 'grep -r "BaseURL" *' and check that these
sysprefs are usually concatenated with some string that starts with a
slash.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Changes to the description appear correctly on both system
preferences.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit da40fe77fc471cfe8e797a7be5f87a506cf9d921)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 46144ea08fd15636c65eef4a094c70ae4eeab9fc)
commit 11c0251aa490e31ae3731080a66586c0d997cf23
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 9 11:41:41 2013 -0400
Bug 10587: fix HTML errors on authority detail page in OPAC
A validator check of the OPAC's authority detail returns a few minor
errors. This patch corrects the errors.
To test, apply the patch and run an OPAC authority detail page through
an HTML validator. There should be no errors which are specific to the
authorities detail template (as opposed to header and footer includes).
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests and QA script pass.
Also checked using the W3C validator and testing the
authority detail page in the OPAC is still correctly
displayed.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 452a4b7775ce10655543aa81f670e2fb497ccc9b)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 5ddc1f43fb18679fadd80d17bb4a45b2d2a6b87b)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 5ddc1f43fb18679fadd80d17bb4a45b2d2a6b87b)
commit b86da7f924e81cb3f233582f362170810cec6c6a
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Jul 30 15:32:31 2013 +0200
Bug 9247 - Add two more usage examples to the manpage for koha-mysql
It might not be immediately obvious that it is possible to send
SQL queries "directly" to the koha-mysql command, or that files
from mysqldump can be loaded with it. This patch adds these as
"example usage" to the man page for koha-mysql.
To test:
Run these commands and look at the formatted man page:
$ xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
debian/docs/koha-mysql.xml
$ man -l koha-mysql.8
Make sure this test passes:
$ prove -v xt/verify-debian-docbook.t
This patch also corrects a couple places where "Koha" was written as "koha".
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Test plan, all tests and QA script pass.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 5b121593800088656a0430da641b4c12a4e53980)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 45f9a4a0385967f5e4dfd2ff4b77412353d77a83)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 45f9a4a0385967f5e4dfd2ff4b77412353d77a83)
commit e02ee046bfc78566a1f048a414fbc6bc4babddee
Author: Kenza Zaki <kenza.zaki at biblibre.com>
Date: Tue Jul 23 16:46:38 2013 +0200
Bug 10528: add unit tests for C4::Bookseller.pm
The tests are wrapped in a transaction.
NOTE: some tests should pass but doesn't because of incoherences in
the code. These tests are in comments and preceded by FIXME
Test plan:
prove t/db_dependent/Bookseller.t
t/db_dependent/Bookseller.t .. 15/53
[Some warnings about uninitialised values]
t/db_dependent/Bookseller.t .. ok
All tests successful.
Files=1, Tests=53, 1 wallclock secs ( 0.02 usr 0.00 sys + 0.46 cusr 0.03 csys = 0.51 CPU)
Result: PASS
http://bugs.koha-community.org/show_bug.cgi?id=10528
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
The new tests pass nicely, as do all old tests and the QA script.
All patches marked as dependencies have been pushed to master
already.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit dc7b5b10e737cc34452dfc6c061cd7c893f08983)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit e647d4e3ed887510db6bf7754bbd37c0401c3999)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit e647d4e3ed887510db6bf7754bbd37c0401c3999)
commit c2b86366e342fef07f2e2b3212800888803f5378
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Jul 9 12:02:00 2013 +0200
Bug 10557: remove unused branch parameter from GetBooksellersWithLateOrders
C4::Booksellers::GetBooksellersWithLateOrders has an unused parameter.
The $branch variable is never used in the routine.
Test plan:
Check that no behavior changes on the late orders page.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I couldn't find any use of the branch parameter apart from
the one corrected by this patch. Also tested late orders,
couldn't find any problems.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7f075448b8e00596ece780cca654471eebf949a3)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 1ad01972ca995bc938ffe55fd43e7a69e03aca5c)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 1ad01972ca995bc938ffe55fd43e7a69e03aca5c)
commit fd8418bc0df27c0863dcf0a59ceb2fed7d3b9d69
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Mon Aug 5 20:33:27 2013 -0400
Bug 9820 follow-up: fix a typo
Although the XSLT template was renamed to nameABCQ, one instance of
the old name (nameABCDQ) was not corrected. This patch corrects that.
To test: Follow test plan on previous patch
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 1e1ccd68aa0642167c2578d167ff3ec343df3a78)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit b64c9255fc14a8b812585990ad3bad2e726365c7)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit b64c9255fc14a8b812585990ad3bad2e726365c7)
commit 98c0bce2778197f17ef096c3e48572edb9361f9f
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Mar 15 14:17:09 2013 -0700
Bug 9820: display titles in MARC21 name headings better in XSLT mode
Prior to this patch, if a 100/700 had a $c, it would be
displayed with no space between the contents of $a and $c in XSLT mode.
For example,
100 1#$aSeuss,$cDr.
would be displayed as
SeussDr
The problem was caused by the original version of the stylesheets
drawing a bit too much from the MARC21 to MODS transformation.
To test:
[1] In a MARC21 database, turn on XSLT display mode for
staff and OPAC.
[2] Create or identify a bib that has a 100 or 700 field
with both a $a and a $c.
[3] Before applying the patch, verify that the name is
displayed in bib details and search results with the
name and title squashed together. For example, "SeussDr"
[3] After applying the patch, verify that the name displays
in bib details and search results with a space and
intervening punctuation between the name and the title. For
example, "Seuss, Dr."
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes test plan, works nicely.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 75959da681ae5f78e70dfd7205a22d16fd28ae38)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 16584258f9a3e3a99065b2aeb3ed4a631b13a04e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 16584258f9a3e3a99065b2aeb3ed4a631b13a04e)
-----------------------------------------------------------------------
Summary of changes:
C4/Bookseller.pm | 4 +-
acqui/lateorders.pl | 2 +-
circ/ysearch.pl | 26 +-
debian/docs/koha-mysql.xml | 21 +-
debian/koha-common.config | 4 +-
docs/history.txt | 48 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 1 -
.../prog/en/modules/admin/preferences/opac.pref | 2 +-
.../en/modules/admin/preferences/staff_client.pref | 2 +-
.../prog/en/modules/patroncards/edit-layout.tt | 32 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 18 +-
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 19 +-
.../opac-tmpl/prog/en/includes/opac-topissues.inc | 2 +-
.../opac-tmpl/prog/en/modules/opac-auth-detail.tt | 9 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 18 +-
.../prog/en/xslt/MARC21slim2OPACResults.xsl | 21 +-
misc/cronjobs/gather_print_notices.pl | 8 +
opac/opac-topissues.pl | 6 +-
t/db_dependent/Bookseller.t | 694 ++++++++++++++++++++
20 files changed, 832 insertions(+), 109 deletions(-)
create mode 100644 t/db_dependent/Bookseller.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list