[koha-commits] main Koha release repository branch, 3.2.x, updated. v3.02.03-152-g62a1cd8
Git repo owner
gitmaster at git.koha-community.org
Tue Mar 22 23:08:17 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.2.x has been updated
via 62a1cd8159e5077d302c6965db187c21dc534225 (commit)
via 2124dc88ef51d4e3f23fceab3e302500c93a0a72 (commit)
via b97494fdee066adc0a08afa8ea0b31a497348a7a (commit)
via 15b86a708b572d14266ac72a35188e33c93619aa (commit)
via 5c83d6291af5ae1d13c51f0a362c1f5f4fa1da5c (commit)
via a952db84d4e293380e03f2d48ae328a81cd251f0 (commit)
via 003e3c75f9bfff4d6be956ea5465035e799e69a6 (commit)
via 320bb8e0bbc64d3396e3b8092a63a6e02d0ba7c9 (commit)
via eb2762145c7d7bf5cc6eebf36b1ddfa1a34db216 (commit)
via a65f0aa20146e5921a89e9d2c6d15bada42a5daf (commit)
via c15e285c84973d209c70f760379faf61974b1d98 (commit)
via 001a561ea835656174ffd855d50a73c135ab5a27 (commit)
via 1a65632c1d0455b81e2776f1a3fd563bcfe4f990 (commit)
via e77a2d82aeb0c1271f1ee6f9e7d0afd25d3c15e0 (commit)
via fe07ac5e1ea245d1e7ad2fd6dae6a2c6f29bed34 (commit)
via 80be71dfd7523447cb5db5bbaa5cec58c7dee595 (commit)
via 56e210d8fdaa942c1f9e94382a054401444f9a20 (commit)
via 6e3466d022bfe4dfadd4e2f2bc21289a9c84e991 (commit)
via 3ca14dd3269b9629d2fe9bbb3bcc78faa6b8a5fa (commit)
from bea1621ffa6717acfaf5685e5514a223fdf16a1a (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 62a1cd8159e5077d302c6965db187c21dc534225
Author: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Date: Mon Mar 21 16:36:20 2011 -0500
Bug 5390: OPAC loses library selection
This patch ensures that the OPAC library selection masthead will always default
to the branch that is currently being searched. This only applies to systems
with multiple branches and OpacAddMastheadLibraryPulldown turned on.
To test: do a search in the OPAC, limiting by branch. The search results will
still have that branch selected in the masthead dropdown.
This patch also fixes bug 5852 and bug 3778.
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Liz Rea <lrea at nekls.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 0a1f05a5a2cbe0bb5665c824c0cbcf1a0851a6fa)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2124dc88ef51d4e3f23fceab3e302500c93a0a72
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Mar 19 17:14:33 2011 -0400
Bug 5834: Holds link missing when 942$c is not for loan
Adds a check for item-level_itypes system preference. Note that this only
applies to the search results screens.
To test:
1) Set item-level_itypes to 'specific item'
2) Create record and set 942$c to an itype that is marked not for loan
3) Create item with itype not marked 'not for loan'
Current behaviour: Holds link is not shown, sys pref setting doesn't matter
After patch: Holds link is shown
- when item-level_itype is 'specific item'
- when item-level_itype is 'biblio record' and 942$c itype is for loan
Holds link is not shown
- when item-level_itype is 'biblio record' and 942$c is not for loan
Signed-off-by: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit e1654e1aa148303fde0d30360f533be26b3029d3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b97494fdee066adc0a08afa8ea0b31a497348a7a
Author: Jesse Weaver <pianohacker at gmail.com>
Date: Fri Mar 18 16:10:19 2011 +0100
Bug 4878 - Command-line tool for getting and setting sysprefs
New script misc/admin/koha-preferences - Allows getting and setting of
sysprefs one-at-a-time or in bulk. More info:
misc/admin/koha-preferences help
or:
misc/admin/koha-preferences manual
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 6ba6b2e148667d7fc1bd382d8f65c06e28768631)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 15b86a708b572d14266ac72a35188e33c93619aa
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Mar 21 16:42:49 2011 +1300
Adding 2 more developers to the history 137 now!
(cherry picked from commit c523ae2d646350996efa9cfc1e6149e1f1fac722)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5c83d6291af5ae1d13c51f0a362c1f5f4fa1da5c
Author: Salvador Zaragoza Rubio <salvazm at masmedios.com>
Date: Fri Mar 18 11:07:04 2011 -0400
Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer
It has been detected an incompatibility with Internet Explorer in the ajax.js
file that cause a javascript error for this browser that prevents proper
operation.
The error occurs because the "localName" is not supported by Internet Explorer
and returns "undefined".
Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer
Fix error on comma for IE
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 0499633a6b27d44bf002bc4d99b82ee63237a001)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a952db84d4e293380e03f2d48ae328a81cd251f0
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Mar 18 15:30:05 2011 +0100
Bug 5892 : opac-user: minor spelling/html changes
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 01b6e7a6ddfbaaca59215f7a88d8aa1010053217)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 003e3c75f9bfff4d6be956ea5465035e799e69a6
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Mar 18 10:15:08 2011 +0000
Bug 5864: link biblio => serials subscription is wrong
The GetSubscription function can be called with 3 parameters : title,
issn, biblionumber.
In biblio view (both opac & staff interface), the link to jump from the
biblio to the subscription(s) was done using title.
The result was that for a title like "Science", all subscriptions
containing "science" in the title were linked.
That's too much and that's false.
This commit fixes this problem by calling GetSubscription with
biblionumber only where applicable.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 632277e453fa80797e1cfc9dc32f1d1d8cc089af)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 320bb8e0bbc64d3396e3b8092a63a6e02d0ba7c9
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Tue Jan 4 21:28:10 2011 +0100
Bug 4330 : Fixing copyright and removing unconditional warn chris c mail 2010-12-16 on patches ML
(cherry picked from commit 528cfd918c2f8f57a392302897977804c5f7e7c8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit eb2762145c7d7bf5cc6eebf36b1ddfa1a34db216
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Tue Jan 4 21:26:38 2011 +0100
Bug 4330 : fixing copyright mail from chris c 2010-12-16 on patches ML
(cherry picked from commit 04869d0fd08c4bad9403f18365d3648ba1410452)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a65f0aa20146e5921a89e9d2c6d15bada42a5daf
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Mar 17 10:37:59 2011 -0400
Bug 3735: Wrong search results for a few fields in ccl.properties
This patch corrects a syntax error in the definition of bath attributes in
ccl.properties. In particular, it adds the search prefixes 'isbn', 'issn',
'name', and 'notes'. In order to make use of this patch, ccl.properties must be
updated.
Signed-off-by: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 975aea1372de1def413ad02330916942e4160533)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c15e285c84973d209c70f760379faf61974b1d98
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu Mar 17 10:34:52 2011 +0000
Bug 5890 Correct Mismatched operator in comparison
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 7f0a326da5bb347310e60103bd3486b22a495743)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 001a561ea835656174ffd855d50a73c135ab5a27
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Mar 16 10:40:41 2011 -0500
Follow-up fix for Bug 4218 - Staff client detail page doesn't show hold status
Signed-off-by: Liz Rea <lrea at nekls.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 4b1fe1c9c33a4ac0924c96fd1aacf076c4f2fa23)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 1a65632c1d0455b81e2776f1a3fd563bcfe4f990
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Wed Mar 16 12:06:37 2011 +0100
Bug 5879 : Biblio.pm : fix isbd syspref and default location
- the systempreference is isbd, not ISBD
- when preparing the ItemRecord (for acq or serials recieving), there was no default value calculated for location. Fixing that
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 620ae78f847ba3c42bcbfd0e0f9a530daa79e65b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit e77a2d82aeb0c1271f1ee6f9e7d0afd25d3c15e0
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Tue Mar 15 15:03:30 2011 +0100
Bug 5646: Translated sql files break messaging
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 1411a929360d1ad667b2178b3d42b82996642bfc)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit fe07ac5e1ea245d1e7ad2fd6dae6a2c6f29bed34
Author: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Date: Tue Mar 15 03:26:24 2011 -0400
Bug 5816: XSLT doesn't display enhanced contents
This patch corrects and standardizes the display of enhanced contents (MARC 505
with ind2='0').
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit de4619b849e4cc6f7bdc821bd52581876a02b7d2)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 80be71dfd7523447cb5db5bbaa5cec58c7dee595
Author: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Date: Wed Mar 16 15:09:46 2011 +0000
Follow up for Bug 3326: previous fix broke searches when
This fix ensures that searches will still work when -x is not used when
reindexing Zebra.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Magnus Enger <magnus at bibkat.no>
Signed-off-by: Jane Wagner <jwagner at ptfs.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit e18ddca9d4a6c741a918be28bb3e2cc3e2b30030)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 56e210d8fdaa942c1f9e94382a054401444f9a20
Author: ruth at bywatersolutions.com <ruth at bywatersolutions.com>
Date: Fri Mar 4 13:04:43 2011 -0600
Bug 3595 (partial): Items seen at checkin are not filling holds well
In Liz's second comment on this bug, she points out that local-only
holds (and also no-holds) items are being used to fill the first hold
in the queue, no matter where located, transitting if necessary. If
all the items on a biblio are set to no-holds types, this problem
would never arise, as no holds could be *placed*. But if you have
one or more unlimitedor local-hold items, then holds are getting
filled by the first item to cross a scanner, no matter what.
This patch will check during C4::Reserves::CheckReserves to make sure
that the hold being handed back to AddReturn is actually fillable by
the item just scanned. One caveat: If CircControl is set to "the library
you are logged in at", this will cause items checked in at
other-than-their-home-library to fill local holds at the library where
scanned. This is, however, an edge case!
Signed-off-by: Liz Rea <lrea at nekls.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 784b9df4f240302d3946089862ca6bf6f33c08a9)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6e3466d022bfe4dfadd4e2f2bc21289a9c84e991
Author: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Date: Mon Mar 14 22:14:19 2011 -0400
Bug 3326: Work around Zebra's handling of & entities
When using XSLT mode, the OPAC results display will show "&" instead of "&"
when Zebra is indexing in XML mode. This patch works around this by replacing
"&" with "&" and then extends the previous fix to apply to all occurrences
of "& " instead of just the first.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit d52f3680f482a42cc98ad9810c011c8775d9b3ee)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3ca14dd3269b9629d2fe9bbb3bcc78faa6b8a5fa
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date: Mon Mar 14 16:27:17 2011 -0400
Bug 5865 - Labels wrap incorrectly when paper width is greater than height
This is due to the incorrect use of string comparators to compare numeric values.
This patch corrects that.
Note: This should be backported to 3.2.x
Signed-off-by: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 5a924cc530658f3ab11cf1a219fd9ba4e602f1e5)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 16 +-
C4/Biblio.pm | 10 +-
C4/Reserves.pm | 6 +
C4/Search.pm | 17 +-
C4/XSLT.pm | 7 +-
catalogue/MARCdetail.pl | 1 +
docs/history.txt | 2 +
etc/zebradb/ccl.properties | 27 +-
.../optional/sample_notices_message_attributes.sql | 11 +-
.../sample_notices_message_attributes.sql | 10 +-
.../optional/sample_notices_message_attributes.sql | 4 +-
.../optional/sample_notices_message_attributes.sql | 4 +-
.../prog/en/includes/biblio-view-menu.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/js/ajax.js | 10 +-
.../prog/en/modules/catalogue/detail.tmpl | 1 +
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 6 +-
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 11 +-
.../opac-tmpl/prog/en/modules/opac-advsearch.tmpl | 2 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 5 +-
.../opac-tmpl/prog/en/modules/opac-userupdate.tmpl | 8 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 6 +-
labels/label-create-pdf.pl | 4 +-
members/moremember.pl | 1 +
misc/admin/koha-preferences | 324 ++++++++++++++++++++
opac/opac-ISBDdetail.pl | 4 +-
opac/opac-detail.pl | 2 +-
opac/opac-search.pl | 3 +-
27 files changed, 431 insertions(+), 73 deletions(-)
create mode 100755 misc/admin/koha-preferences
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list