[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.11-25-g70996a7
Git repo owner
gitmaster at git.koha-community.org
Sun Oct 13 22:22:49 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 70996a7fe9c2d71593dc730df84713d5e0971b35 (commit)
via 0a0cba6225fd76e0e45d000708bccd49c6a06c82 (commit)
via 3bd4602e1190fab8e10c6219e54eff31b0c23a8a (commit)
via 927cda88ae17be77cd20cbdd326c8707884faaf2 (commit)
via e868a83d94ab40a6575da80adabaf59b416df4c6 (commit)
via fe341f963e922a08866a3a6ef92bdbd988ab0260 (commit)
via 38f56a502343a6b56762f69a407568a5c81a4761 (commit)
via d326621c9da8bdb73c52f315ef11961c7206ff9b (commit)
via 40c2eab2207dbace7f0e89870183b035572bfdb6 (commit)
via d774afe1214dd408d56430f70780353965cc07cc (commit)
via 7e6e331a3f751fd20622a14d44b74cfa17d7964e (commit)
from 8b9759e6574132b3b87e6a4a4ad768fc6621087d (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 70996a7fe9c2d71593dc730df84713d5e0971b35
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri May 24 14:51:14 2013 +0200
Bug 10333: Labels/t_Batch.t needs to create its own data
prove t/db_dependent/Labels/t_Batch.t
db_dependent/Labels/t_Batch.t .. 1/33 # Testing Batch->new() method.
db_dependent/Labels/t_Batch.t .. ok
All tests successful.
Files=1, Tests=33, 1 wallclock secs ( 0.03 usr 0.00 sys + 0.34 cusr
0.00 csys = 0.37 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 402435b17a1ae32fb41b6fdde39b94059fdb2c2f)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 394969143b731985dee12acbcbd7c849b8bd93a5)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 394969143b731985dee12acbcbd7c849b8bd93a5)
commit 0a0cba6225fd76e0e45d000708bccd49c6a06c82
Author: Janusz Kaczmarek <januszop at gmail.com>
Date: Mon Mar 18 22:16:22 2013 +0200
Bug 10324: fix display of editorial series in normal view (UNIMARC / no XSLT)
The patch corrects the issue -- the content of the field 225 shall be
displayes under Series now.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Comment: Work as described, no koha-qa errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Comparing the XSLT with the normal view the patch seems to
work correctly. Passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 384566c1295a81dce0d9de001fcde36f2a996dfa)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 09b01f21276c309b4741abf31aafae9b2341c16f)
commit 3bd4602e1190fab8e10c6219e54eff31b0c23a8a
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun Sep 8 01:20:05 2013 +0000
Bug 10272: (follow-up) add regression test
This patch adds a regression test for this bug, effectively
implementing the manual test plan in the previous patch.
To test:
[1] Verify that prove -v t/db_dependent/Reserves.t passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit e831a7eb3fe21561264cc756f40c539333e8ebbc)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 9dba1f477703bb5d9bb152de9670fa6ee18c6999)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 9dba1f477703bb5d9bb152de9670fa6ee18c6999)
commit 927cda88ae17be77cd20cbdd326c8707884faaf2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri May 17 07:08:24 2013 -0500
Bug 10272: make CheckReserves respect ReservesControlBranch
CheckReserves was using the CircControl system preference to determine what
patrons an item can fill a hold for. It should be using ReservesControlBranch
instead.
Test Plan:
1) Set ReservesControlBranch to "item's home library".
2) Create an item at Library A, place holds for it for patrons at
Library B, Library C, and Library A in that order,
for pickup at the patrons home library.
3) Make sure the holds policy for Library A is set to
Hold Policy = "From home library" and
Return Policy = "Item returns home".
Make sure the holds policies for the other libraries are set to
Hold Policy = "From any library".
4) Check the item in at Library C, the hold for the patron at Library B
should pop up, even though it's in violation of the circulation rules.
Don't click the confirm button!
5) Apply this patch, and reload the page,
now the hold listed should be for the last hold,
the hold for the patron at Library A, which is correct.
This patch adds the subroutine C4::Reserves::GetReservesControlBranch as
an equivilent to C4::Circulation::_GetCircControlBranch.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Fixed POD so that arguments and explanation match (C<$item>).
Also tested opac-reserves.pl for regressions.
Passes all tests, QA script, and Reserves.t.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 78eba2f974ca9e8ff51f64d2356b004e7bfcecff)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 2448e200e2b520ce5bfe01f3256f1de0659d71c7)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 2448e200e2b520ce5bfe01f3256f1de0659d71c7)
commit e868a83d94ab40a6575da80adabaf59b416df4c6
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 1 10:57:02 2013 -0400
Bug 10672 - Add subtitle to display of checkouts, overdues, and holds on the patron summary
In the OPAC, the patron summary page (opac-user.pl) should display
subtitle along with title in the lists of checkouts, overdues, and
holds. This patch adds it.
To test, log in to the OPAC as a patron who has checkouts, overdues, and
holds which include titles with subtitles. Titles should appear
correctly with and without subtitles.
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 ec070fa8375d9001041fc089ff193b17f87ae4c1)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 14d2ac659a55e9a3fd601994546c538a1fb11f6f)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 14d2ac659a55e9a3fd601994546c538a1fb11f6f)
commit fe341f963e922a08866a3a6ef92bdbd988ab0260
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Fri Aug 16 15:10:56 2013 +0200
Bug 10742: improve converting simple search to Z39.50 search
In intranet, when search does not return results, there is a button
to perform the same search on Z39.50 servers. This works well when
coming from advanced search. But when using simple search from header,
in the Z39.50 search box "kw,wrdl" is added to the operand in title.
This patch simply adds kw as default value when the cgi does not have
idx parameter.
Test plan :
- In intranet, perform a search from header that does not return any
result. For example "afalseword"
- Click on "Z39.50 Search"
=> you get a popup with the searched word in title. For example:
Title: afalseword
- Go to advanced search page
- Enter the same word into first input and submit
- Click on "Z39.50 Search"
=> you get a popup with the searched word in title.
Signed-off-by: David Cook <dcook at prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Small change, fixes an annoying problem.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0ab71d32641d092d11228f0e2282dd8805198720)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 40e0fccdd9c3d09a95543671f90a3a163e225ce4)
commit 38f56a502343a6b56762f69a407568a5c81a4761
Author: David Cook <dcook at prosentient.com.au>
Date: Wed Aug 28 11:55:02 2013 +1000
Bug 10793: XSLT change 780/785 search queries to use ti,phr indexes like other linking entries
This patch adds the ti,phr index to the search queries for the 780
and 785 MARC fields in the XSLT templates.
Test Plan:
1) Use a record with 780 and 785 MARC fields with data in the "a" or
"t" subfields. (You might need to add these fields to an existing
record, or create a new record. You might also need to change your
MARC Bibliographic Framework settings to not "hide" these fields in
your framework(s)).
N.B. The data in the "a" or "t" subfields should be a title that
exists in your database. Otherwise, this test might seem misleading.
2) Set the system preferences "XSLTDetailsDisplay" and
"OPACXSLTDetailsDisplay" to "default".
3) Go to your record (which contains the 780/785 fields), and look
for links with linktext derived from the "a" or "t" fields in the
record. These may or may not be prefaced with labels such as
"Continued by" or "Continues".
4) Note that the links are formatted "q=TITLE". Click this link
and note the possibly high number of results.
5) APPLY THE PATCH
6) Shift+Refresh your record page, and observe that the link should
now say "q=ti,phr:TITLE". Click this link and note that you are
either taken directly to the referenced article or that your
search results are considerably fewer.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
XSLT change only, no regressions found.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 275dfd2fac59c824d9591644fe982e9008032407)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit df14898902105a5404d640fae2478ab63185f387)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit df14898902105a5404d640fae2478ab63185f387)
commit d326621c9da8bdb73c52f315ef11961c7206ff9b
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Thu Jun 13 20:22:51 2013 +0200
Bug 10218: Add individual CSS classes for bibliographic information in OPAC (UNIMARC)
Follow-up for UNIMARC XSLT Display
This patch adds class to span markup in list and detail display.
XSLT are not build in the same way in MARC21 and UNIMARC, so I had
to add a parameter "spanclass" to 3 templates called in UNIMARC :
tag_title, tag_7xx, tag_comma
To test, apply the patch on a Koha instance with UNIMARC records, and
- activate sysprefs OPACXSLTDetailsDisplay and OPACXSLTDetailsDisplay
- make a search on the OPAC. In the results, check the spans with
"results_summary" class have also more a precise class.
Ex : span class="results_summary publication"
- view some records in detailed view. If possible, a record with
a series, a record with some subjects, a record with different authors,
a record with a link in 856. Check the spans with "results_summary"
have also a more precise class.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Comment: Works exactly as described on results and detail.
No koha-qa errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
XSLT only change.
Tested in a UNIMARC install, HTML source code looks ok.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 3d6bec745536a3e91e960d55542ec7233c17cfce)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 74766450053bf1fb97f8b2136e484e990f846f1f)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 74766450053bf1fb97f8b2136e484e990f846f1f)
commit 40c2eab2207dbace7f0e89870183b035572bfdb6
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Aug 28 11:48:16 2013 -0300
Bug 10609: Use branch name rather than branch code in serials-collection.pl (3.12.x)
This is the 3.12.x compatible version of the patch for 10609.
Regards
To+
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Serial collection page now displays the branch description
instead of the branchcode.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit ac5aae6dd4b346f65882073b54242fa93430f621)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Also works on 3.10
(cherry picked from commit ac5aae6dd4b346f65882073b54242fa93430f621)
commit d774afe1214dd408d56430f70780353965cc07cc
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Sep 19 12:40:03 2013 -0300
Bug 10915: (QA followup) warn if cannot read history.txt
This patch makes about.pl test if success opening history.txt, and
shows a convenient warning to the end user. No more warnings in the logs
(about.pl: readline() on closed filehandle $file at /usr/share/koha/intranet/cgi-bin/about.pl line 166)
and better problem solving information for the end user.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 45b85a700fcb4c9db07ec0bd13ecd8463696c4c2)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 5b4ebc0435b57d0655c1c6be5c3951862bef16d1)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 5b4ebc0435b57d0655c1c6be5c3951862bef16d1)
commit 7e6e331a3f751fd20622a14d44b74cfa17d7964e
Author: Mason James <mtj at kohaaloha.com>
Date: Fri Sep 20 00:06:20 2013 +1200
Bug 10915: fix About->timeline breakage on incompletely upgraded Koha
This patch supplies a default value for the koha-conf.xml
setting docdir to handle the case where the user neglects
to set it upon upgrade.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Fixes dev and standard installs without docdic tag in koha-conf.xml.
Doesn't break when docdir present either. Warning still present
on packages install that didn't add the docdir definition in koha-conf.xml
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 3ae471a352fa2b00782c29c5c40f39db04fe510a)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 77daa7d76d9883cb53366e968c89179515e9b2b9)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 77daa7d76d9883cb53366e968c89179515e9b2b9)
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 6 +-
C4/Reserves.pm | 30 ++++-
C4/Serials.pm | 23 ++--
about.pl | 68 ++++++-----
catalogue/search.pl | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 6 +
.../prog/en/modules/serials/serials-collection.tt | 4 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 4 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 6 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 4 +-
.../prog/en/xslt/UNIMARCslim2OPACDetail.xsl | 43 ++++---
.../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 5 +-
.../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl | 18 +--
opac/opac-reserve.pl | 2 +-
opac/opac-user.pl | 4 +-
serials/serials-collection.pl | 6 +
t/db_dependent/Labels/t_Batch.t | 56 +++++++--
t/db_dependent/Reserves.t | 125 +++++++++++++++++++-
18 files changed, 322 insertions(+), 90 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list