[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-51-gb64c925
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 13 17:46:25 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.12.x has been updated
via b64c9255fc14a8b812585990ad3bad2e726365c7 (commit)
via 16584258f9a3e3a99065b2aeb3ed4a631b13a04e (commit)
via e28f2f5ff680e8486fb70e4197c1f8c91d564249 (commit)
via 0de2e0b55876fa6de5efb981972c064c7aa5a75e (commit)
via 7daec54dc80f2d1f7c3ea8b55416e18082c8f3fb (commit)
via 65e0bbb2632611e8d9bd082aa882e7908350b9ee (commit)
via e143ff307286698575a41e943202c902f1493071 (commit)
via 4de32c9586e4615079cf3d0de801df2d38eb3f6c (commit)
via 7c7aee054fa8af8e753d7f9391a27efb83f9b52c (commit)
from 66b214899fe6624a023ee16e3e920414f27abb8a (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 b64c9255fc14a8b812585990ad3bad2e726365c7
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>
commit 16584258f9a3e3a99065b2aeb3ed4a631b13a04e
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>
commit e28f2f5ff680e8486fb70e4197c1f8c91d564249
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Jul 25 16:08:43 2013 -0300
Bug 10645: adding missing zebra languages to koha-create manpage
There were some missing zebra language options in the man page for koha-create.
Trivial string change.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Tested using the following commands:
$ xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
debian/docs/koha-list.xml
$ man -l koha-list.8
Also:
prove -v xt/verify-debian-docbook.t
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 90cf2f3a265a741bc4d475077dc3a604a08e6192)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0de2e0b55876fa6de5efb981972c064c7aa5a75e
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Aug 19 18:22:00 2013 +0000
Bug 10766: unbreak reservoir search when UseQueryParser is OFF
To test:
[1] Turn UseQueryParser off.
[2] Ensure that your database has records in the reservoir. Performing
a Z39.50 search will do this.
[3] Perform a broad cataloging (i.e., cataloguing/addbooks.pl search).
Note that results are returned from the main catalog but that no
reservoir results are returned.
[4] Apply the patch.
[5] Perform the search again. This time, there should be both catalog
and reservoir results.
[7] Enable QueryParser. Perform the search again, and verify that the
catalog and reservoir results are the same.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Patch works nicely, passes all tests, and the QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 4309e5e6b4682b95db4ca26f7a49f96c2f6c2875)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 7daec54dc80f2d1f7c3ea8b55416e18082c8f3fb
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Aug 23 15:58:01 2013 +0000
Bug 10741: (follow-up) add regression test
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 8e7379342d7cd8386baf884a77f54f95188bb85c)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 65e0bbb2632611e8d9bd082aa882e7908350b9ee
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Fri Aug 16 13:53:04 2013 +0200
Bug 10741: reformat test for displaying place hold link in OPAC search results
To test:
[1] Turn on the syspref for enabling OPAC holds.
[2] Create an item and bring it up on the OPAC search
results. Run through the following possibilities,
by changing the item, and verify that the place hold
link in OPAC search results appears only when the item is
- not lost AND
- not withdrawn AND
- not damaged (or is damged and AllowHoldsOnDamagedItems is ON) AND
- the item is not marked not-for-loan OR
the item has a negative notforloan value (e.g., it is on order)
Note that it is necessary to reindex the test bib after making
each change to the test item.
[3] Also verify that whether or not in the item is in transit does
NOT affect whether the place hold link appears.
[4] Verify that there is no regression on bug 8975 (i.e., if an
item is on order, that status should be displayed in staff client
search results).
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 397ba93f97855625865689ef0dd0c69a20c8a915)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e143ff307286698575a41e943202c902f1493071
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Fri Aug 16 13:36:10 2013 +0200
Bug 10741: restore holdability of in-transit items on OPAC search results
In search results, one could not place a hold on an item in transit
and for loan (items.notforloan=0). This appears when AllowOnShelfHolds
is allowed.
This patch repairs a regression introduced by the patch for bug 8975.
Test plan :
- Set AllowOnShelfHolds to on
- Create a record with a normal item : not lost, not withdrawn, not
damaged, notforloan=0
- Index this record
- Perform a search on OPAC that returns this record (and others)
=> You see in actions "Place hold"
- Add this item in transit : /cgi-bin/koha/circ/branchtransfers.pl
- Re-perform the search on OPAC
=> You see in actions "Place hold" and item "in transit"
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 239513dc7a13a1a31356b59ab8e36b120c0fa281)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 4de32c9586e4615079cf3d0de801df2d38eb3f6c
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Thu Aug 15 22:08:41 2013 -0400
Bug 10743: Add styles to 'my privacy' page in OPAC
This patch does a couple things. Most importantly it adds
a new div around the privacy rules summary so that it can
be easily changed. It also moves the start of the form to
right above the form's select box so that it's not in the
new privacy rules div.
To test:
* Apply patch
* Enable the use of privacy via the sys prefs
* Log in to the OPAC
* Visit the 'my privacy' tab
* Make sure it looks okay
* Submit the form and make sure it works
* Repeat in the other theme
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Edit: Replaced a few tabs with spaces to keep the QA script happy.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely, privacy options can still be edited.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 841fe4559f6264295ec4cfde6ddd6e22a151d6bf)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 7c7aee054fa8af8e753d7f9391a27efb83f9b52c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jul 23 08:05:22 2013 -0400
Bug 10628: make sure AutomaticItemReturn doesn't prevent holds queue from filling local holds with local items
For some reason, C4::HoldsQueue::MapItemsToHoldRequests used the system
preference AutomaticItemReturn to decide if an attempt to fill local
holds with local items. No explanation of this behavior is provided.
This patch removes this behavior, and also adjusts the calculation
of the lead-cost library to always return the pickup library if it
is on the list of libraries that could fill the hold -- on the
basis that if the item is already at the pickup library, its
transport cost is inherently zero.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes QA script and adds unit tests.
Tested with some examples and those worked correctly.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit d46657f8af980524a4351e40abe0b901d1af3e6a)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Small merge problem in the tests.
-----------------------------------------------------------------------
Summary of changes:
C4/HoldsQueue.pm | 13 +++++---
C4/Search.pm | 28 ++++++++------------
cataloguing/addbooks.pl | 9 ++++--
debian/docs/koha-create.xml | 2 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 18 ++----------
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 19 ++-----------
.../opac-tmpl/prog/en/modules/opac-privacy.tt | 7 +++--
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 18 ++----------
.../prog/en/xslt/MARC21slim2OPACResults.xsl | 21 +++------------
t/db_dependent/HoldsQueue.t | 11 +++++---
t/db_dependent/Search.t | 24 ++++++++++++++++-
11 files changed, 73 insertions(+), 97 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list