[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.10-66-gacb5687
Git repo owner
gitmaster at git.koha-community.org
Sun Sep 15 03:26:46 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 acb56877853af69072d5f8b5073810e2e0a7fd7b (commit)
via 7c61d1b9c6d56973e5d0538c66709e4eebdfb2ef (commit)
via ee0a2934d4f1331be09867869d90166467360434 (commit)
via a198cba41aff6fd4181b42592ba5afb5f7ef51eb (commit)
via b068d7c8e33adee88960b1583292ab089c345f21 (commit)
via 8c6c5509a52905d54fd205596f2b36eb697c29c1 (commit)
via 64c3c216498a0144319639dd381c28c9d717f1bb (commit)
via bc26b55dfb949d866a64ee91317b079b45f50c39 (commit)
via eb62e304a94c5eb1716abf4c6123bd6ae86593aa (commit)
via 25191a43a540b8fc84816d3f95b3e29f88424bd4 (commit)
via 109cbf0892a319a641139e6b7a6ae0613fa79cc2 (commit)
via 752f8049edff0d0a1c9061dc5141fd3af7436869 (commit)
via f17210a19c9727a4c30f3d40a94d4649f39f557e (commit)
from 6a57f7f1fa351b5b2cbdcae29c7fb09250a68c04 (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 acb56877853af69072d5f8b5073810e2e0a7fd7b
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>
(cherry picked from commit e28f2f5ff680e8486fb70e4197c1f8c91d564249)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit e28f2f5ff680e8486fb70e4197c1f8c91d564249)
commit 7c61d1b9c6d56973e5d0538c66709e4eebdfb2ef
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>
(cherry picked from commit 7daec54dc80f2d1f7c3ea8b55416e18082c8f3fb)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 7daec54dc80f2d1f7c3ea8b55416e18082c8f3fb)
commit ee0a2934d4f1331be09867869d90166467360434
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>
(cherry picked from commit 65e0bbb2632611e8d9bd082aa882e7908350b9ee)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 65e0bbb2632611e8d9bd082aa882e7908350b9ee)
commit a198cba41aff6fd4181b42592ba5afb5f7ef51eb
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>
(cherry picked from commit e143ff307286698575a41e943202c902f1493071)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit e143ff307286698575a41e943202c902f1493071)
commit b068d7c8e33adee88960b1583292ab089c345f21
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.
(cherry picked from commit 7c7aee054fa8af8e753d7f9391a27efb83f9b52c)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 7c7aee054fa8af8e753d7f9391a27efb83f9b52c)
commit 8c6c5509a52905d54fd205596f2b36eb697c29c1
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 19 10:55:52 2013 -0400
Bug 8670 - Update POD of C4::Branch::GetBranches() to use TT syntax
This patch updates the example template syntax in the POD for
C4::Branch::GetBranches() to use Template Toolkit syntax.
To test, view the POD for C4::Branch::GetBranches() and confirm that it
looks correct.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Checked the POD with "perldoc C4/Branch.pm" before and after applying
the patch. The example now uses TT syntax, and looks sensible.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7ae3ea68579b3f870d7e42968c3727ecffac7f02)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 66b214899fe6624a023ee16e3e920414f27abb8a)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 66b214899fe6624a023ee16e3e920414f27abb8a)
commit 64c3c216498a0144319639dd381c28c9d717f1bb
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 19 11:16:51 2013 -0400
Bug 10763 - [SIGNED-OFF] Update POD of C4::Creators::Lib::html_table() to use TT syntax
This patch updates the example template syntax in the POD for
C4::Creators::Lib::html_table() to use Template Toolkit syntax.
To test, view the POD for C4::Creators::Lib::html_table() and confirm
that it looks correct.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Checked the POD with "perldoc C4/Creators/Lib.pm" before and after applying
the patch. The example now uses TT syntax, and looks sensible.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 54c6dccca70a142c14fff049cb3212694af86610)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit a55080c88593b5e0e0d3d8192ee9c7f09e78d258)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit a55080c88593b5e0e0d3d8192ee9c7f09e78d258)
commit bc26b55dfb949d866a64ee91317b079b45f50c39
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 19 11:37:55 2013 -0400
Bug 10764 - Update POD of C4::Items::GetItemStatus() to use TT syntax
This patch updates the example template syntax in the POD for
C4::Items::GetItemStatus() to use Template Toolkit syntax.
To test, view the POD for C4::Items::GetItemStatus() and confirm that it
looks correct.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
This patch works as advertised (verified with "perldoc C4::Items"),
for GetItemStatus, but it does not fix a a similar example for
GetItemLocation in the same file, which still has the old template
syntax. So a followup or separate bug for that is called for.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
It seems the default option is not in used in templates.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit d515457c719197e66bd0a10c7011b407af2faa23)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 3ca258cd4aeba3b8bcb86dbdb28b55657e1c1e46)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 3ca258cd4aeba3b8bcb86dbdb28b55657e1c1e46)
commit eb62e304a94c5eb1716abf4c6123bd6ae86593aa
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 19 12:06:31 2013 -0400
Bug 10765 - [SIGNED-OFF] Update POD of C4::Koha::GetSupportList() to use TT syntax
This patch updates the example template syntax in the POD for
C4::Koha::GetSupportList() to use Template Toolkit syntax.
To test, view the POD for C4::Koha::GetSupportList() and confirm that
it looks correct.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
This patch works as advertised (verified with "perldoc C4::Koha"),
for GetSupportList, but it does not fix a a similar example for
GetItemTypes, getauthtypes and getframework in the same file,
which still has the old template syntax. So a followup or separate
bug(s) for those are called for.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
It seems the default option is not in used in templates.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 3429e5e16da0b23615fac4ca0bb6251fac70301c)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit a011492c7e5cdc3c0ef9db1ca1c415ec078e1f6c)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit a011492c7e5cdc3c0ef9db1ca1c415ec078e1f6c)
commit 25191a43a540b8fc84816d3f95b3e29f88424bd4
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Aug 13 12:27:28 2013 -0400
Bug 10081: add library name to IndependentBranches error message
With IndependentBranches turned on, if you try to check out an item
which belongs to another library you will get an error message which is
missing the library name. This patch corrects the problem by passing the
necessary variable to the template and outputting the library name using
the KohaBranchName TT plugin.
To test, turn on IndependentBranches and try to check out an item
belonging to another library (note that you must test with a staff user
who is not a superlibrarian). The error message you see should include
the name of the library to which the item belongs:
"This item belongs to Nelsonville and cannot be checked out from this
location."
Checkouts of items belonging to the library should be unaffected.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 50ff4f4a94598ce197c0ca5656d314195cf69d07)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 624af4b7f11a4ff8bccf3252e72880cec9c22b1b)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 624af4b7f11a4ff8bccf3252e72880cec9c22b1b)
commit 109cbf0892a319a641139e6b7a6ae0613fa79cc2
Author: Jonathan Field <jonathan.field at ptfs-europe.com>
Date: Fri Aug 9 11:38:31 2013 +0100
Bug 10704: make OPAC highlighting work across previous/next travel
To test
Enable 'OpacHighlightedWords'
1) Run a search with multiple results
2) Click on a title of one of the results to get the full record
display. Hit highlighting SHOULD work on this page.
3) Use either the "Next" or "Previous" buttons on this page
(opac-detail) to move to the next or previous record.
4) Moving forward or back, the highlighting should still be working on
the page.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7d0aea7c39e22f42760c3ecbba4c0cd0818785a7)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 885e928aaeddca5adc24061b615a0388d1c8e828)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 885e928aaeddca5adc24061b615a0388d1c8e828)
commit 752f8049edff0d0a1c9061dc5141fd3af7436869
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Aug 14 14:53:25 2013 +0000
bug 10728: fix additional log noise generated by subscription-renew.pl
To test:
[1] Use the renew link to bring up the subscription renewal form.
[2] Verify that a warning message containing the text
'Problem = a value of 1 has been passed to param without key'
was not added to the Apache error log.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 6e864430caaa951b06d5fecff3fe7864317e5e26)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 3cd7313007061c0e644d0daf37cf79739c342717)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 3cd7313007061c0e644d0daf37cf79739c342717)
commit f17210a19c9727a4c30f3d40a94d4649f39f557e
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Wed Aug 14 15:26:34 2013 +0100
Bug 10728: fix log noise generated by subscription-renew.pl
Error log is showing warnings because mode is undefined
and we are doing string comparisons on it.
Set it to a default value (we were already assigning it a variable
which we were not using) and use the the result in the comparison
To test, after applying the patch:
[1] Use the renew link from the subscription detail page to renew
a subscription.
[2] Verifying that doing this did not add a warning containing
'subscription-renew.pl: Use of uninitialized value $mode in string eq '
to the Apache error log.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 27edb618dd604e0a718f43e98ed97255f72eb515)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 70681a47f2cefcdee665d4d8076f3228eee891de)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 70681a47f2cefcdee665d4d8076f3228eee891de)
-----------------------------------------------------------------------
Summary of changes:
C4/Branch.pm | 14 ++++--
C4/Circulation.pm | 6 ++-
C4/Creators/Lib.pm | 46 +++++++++----------
C4/HoldsQueue.pm | 13 +++--
C4/Items.pm | 16 ++++---
C4/Koha.pm | 20 ++++----
C4/Search.pm | 28 +++++-------
debian/docs/koha-create.xml | 2 +-
.../prog/en/modules/circ/circulation.tt | 3 +-
opac/opac-detail.pl | 4 +-
serials/subscription-renew.pl | 6 +-
t/db_dependent/HoldsQueue.t | 11 +++--
t/db_dependent/Search.t | 24 ++++++++++-
13 files changed, 112 insertions(+), 81 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list