[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.00-48-g16189ed
Git repo owner
gitmaster at git.koha-community.org
Sat Nov 19 23:06:55 CET 2011
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.6.x has been updated
via 16189ed8c37960a76d80899004654e617d98bcde (commit)
via 7e92a497aa2d1c25ab0950855e1a57fc1dd897d1 (commit)
via 4d09e483846fb6d8d1df2f44eae874ba074db3a7 (commit)
via 112c4363396b220146a4a5bb10f28f0b30de9da0 (commit)
via b7e29b201ac85c2483b1d7877e330bc9f3acee2d (commit)
via 35eb4ced52459a8c4e84a8cd16ff4fa76be15c58 (commit)
via 5d529084c3ef1a1aa45d7919f823474583ec5d88 (commit)
from 5006dd4858f5b0b50acdaec4d2e0dbe821753c60 (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 16189ed8c37960a76d80899004654e617d98bcde
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Nov 18 23:28:38 2011 +0100
Joy nelson was already in history.txt, removing the entry
(cherry picked from commit 9c5d3ea3aa28b71f0fb4148b8fdf9f2a002f79f5)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7e92a497aa2d1c25ab0950855e1a57fc1dd897d1
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 11 12:34:44 2011 -0500
Incremental fix for Bug 2847, Use HTML escape in templates where appropriate
Fixes for output in a couple of acquisitions templates where
user-generated data should be escaped. This instances were found
by creating a vendor name like "Baker & Taylor" and finding
that the ampersand was not escaped, causing validation errors.
This patch also consolidates multiple <script> blocks which
do not need to be separate and corrects a couple of unclosed
<input> tags.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit bfe06ef399da831e5602784fbe54cea6dfc1ab65)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4d09e483846fb6d8d1df2f44eae874ba074db3a7
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Sat Aug 27 13:32:08 2011 +0200
Bug 6799 rebuild_zebra.pl -x produces invalid XML records
This patch allow to handle properly items containing extended characters and
send valid XML records to zebraidx
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 4ce57a102b1c0404bc4ae67032bcb1cbbc769fc7)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 112c4363396b220146a4a5bb10f28f0b30de9da0
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date: Wed Oct 26 11:14:05 2011 -0400
Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit a340ded2ca5b95b1ae4f14423cab3fda107ed597)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b7e29b201ac85c2483b1d7877e330bc9f3acee2d
Author: Frédérick Capovilla <frederick.capovilla at libeo.com>
Date: Fri Oct 21 12:04:03 2011 -0400
Bug 6977: Follow-up patch : catch CloneSubfield errors
A javascript error could occur if the CloneSubfield function failed for
any reason. This would prevent the popup from disappearing.
Example : Importing informations of a UNIF_TITLE authority with multiple
$x subfields in the biblio's 440 field. 440$x isn't repeatable, so an
error occurs when trying to clone it.
http://bugs.koha-community.org/show_bug.cgi?id=6977
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 6dac7273fbc2eff7805d2a9bda1eb9a275962c00)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 35eb4ced52459a8c4e84a8cd16ff4fa76be15c58
Author: Salvador Zaragoza Rubio <salvazm at masmedios.com>
Date: Wed Jun 22 18:18:40 2011 +0200
Bug 6475 - Edit it's not possible in subfield "0" in MARC framework
When trying to modify the subfield "0" on a field in the
MARC subfield structure admin -> Tag xxx Subfield Constraints,
the boolean condition on liblibrarian fails for the initial "0" value.
Modified condition to allow the value "0"
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 042f89e939984b2b9e568622e0b99c95db09750e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5d529084c3ef1a1aa45d7919f823474583ec5d88
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Thu Nov 17 10:27:47 2011 -0500
Bug 7134: patron records getting corrupted birthdates
If no date of birth is provided in a new member form, the borrower gets the birthdate of "00/02/0", which
is obviously incorrect (the result of passing 0 to the database directly)
The fix is to remove a conditional check buried deep in C4::SQLHelper. This is in a helper subroutine that was changed
for the Unified Member Search dev (bug 6253). Reverting this small change to the conditional does not seem to break
search, but testing will be required.
To test:
1. apply patch, and create a new patron with blank birthdate. The new patron should now have a blank birthdate instead of '00/02/0'
2. search for a borrower by 1 part surname, confirm search works
3. search for a borrower by 2 part surname, confirm search works
4. search for a borrower across firstname AND surname; confirm
5. search for a borrower and include categorycode/branchcode filters
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
I confirm all working tests 1-5
1. Created patron with blank birthdate - birthdate was blank
2. Searched for patron "henry james acevedo III" by using "acevedo" - result was correct
3. Searched for mr. acevedo using "Acevedo III" - result was correct
4. Searched for Henry James Acevedo III, Henry Acevedo and James Acevedo - results were correct
5. Searched for Mr Acevedo with the branch he was not in, with the branch he is in, with a category he was not, and a category he was. All results were correct.
also noted: inner searching seems to be working now? Example: Henry James (firstname) Acevedo III (surname) - searching James Acevedo brings back the correct patron.
Not complaining, just noting. :)
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 440c0f21ee59664bfbd2238c638f84a6af3d9d80)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/SQLHelper.pm | 2 +-
admin/marc_subfields_structure.pl | 2 +-
docs/history.txt | 2 +-
.../prog/en/includes/acquisitions-search.inc | 6 +++---
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 17 +++++------------
.../authorities/blinddetail-biblio-search.tt | 16 ++++++++++++----
misc/migration_tools/rebuild_zebra.pl | 12 +++++-------
t/00-merge-conflict-markers.t | 3 +--
8 files changed, 29 insertions(+), 31 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list