[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.10-29-g0013f6f
Git repo owner
gitmaster at git.koha-community.org
Wed Dec 26 21:49:07 CET 2012
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 0013f6fa45e755a285752a67af8729a47a2e79cd (commit)
via f5998416801dbc1b542a01c31ee8c95b977cd753 (commit)
via 2899756ead6021d37e3a8f1629c05602fe24269e (commit)
via 785b7ea93f305e7c659d878247318e2cf23752cd (commit)
via b44bd1c0488c168d3a0815ad0d375f26ffabe4d8 (commit)
via bd35ea5ff6a750e75b4bcb26a337f8b2f12d05e4 (commit)
via a8a191bcb35c68c1245eb6bdb324cc4316c9dcbb (commit)
via a7277ff28acf5c00b20cecd6bad64932af78b86c (commit)
via 0a23401f38c20682f7fe2f0c88bb86fa6441e0ad (commit)
from 59c8739715f29cb550bebc305b4620b485ffb2e5 (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 0013f6fa45e755a285752a67af8729a47a2e79cd
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Fri Nov 23 12:30:26 2012 -0500
Bug 9135: updatedatabase.pl fails when DEBUG is set
When the DEBUG environment variable is set to a true value, all DBI
errors are treated as fatal. Unfortunately, duplicate keys are
incredibly common in updatedatabase.pl, since sysprefs are often added
in testing, then re-added once the patches have been pushed to master
(or added when on a maintenance branch, and then re-added when the
system is upgraded to either a newer maintenance branch or master).
This patch disables fatal errors for the updatedatabase.pl script.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests and perlcritic pass.
To test, run from command line:
export DEBUG=1
installer/data/mysql/updatedatabase.pl
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
If a query causes an error, the script continues as expected.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
commit f5998416801dbc1b542a01c31ee8c95b977cd753
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 28 10:02:35 2012 -0500
Bug 7129 [3.8.x] actual cost showing too many zeros
Reimplemented for 3.8.x: Added a sprintf to format the actual cost
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Simple bug fix, TT plugin would be nicer but this is a perfectly
acceptable fix for now
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
commit 2899756ead6021d37e3a8f1629c05602fe24269e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 21 14:38:12 2012 -0500
Bug 8820 [3.8.x] Don't show orders table if there are no orders
Reworkd for 3.8.x: Patch removes the "basket empty" message in
favor of hiding the orders table altogether when a basket has
no orders.
Other textual changes:
- Correcting capitalization according to coding guidelines
- Replacing the "Order Details" heading with the more
succinct "Orders"
Signed-off-by: Melia Meggs <melia at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests pass, template change only.
To test:
1) Create a new basket - verify 'basket empty' shows up
2) Create order line - verfiy table heading is 'Order Details'
3) Close basket, check capitalization on basket group dialog
Repeat with patch applied.
- 'basket empty' is gone
- Heading is now 'Orders'
- Capitalization on basket group dialog is correct
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 785b7ea93f305e7c659d878247318e2cf23752cd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Nov 19 11:00:15 2012 -0500
Bug 9106 - Filtering list of uncertain price list by owner empties order information
The form which filters the list of orders with uncertain prices
includes a parameter which tells the script to modify the orders,
resulting in order information being lost. This patch removes
the unnecessary form field.
To test you must have orders with uncertain prices, preferably from
more than one user. Go to the uncertain prices page. Before applying
this patch, submitting the "orders from" form would cause the page
to refresh with no results. This is because the script cleared the
orders of price, quantity, etc. information.
After applying this patch the uncertain prices list should refresh
and show the correct results, either your orders ("me") or all
("Everyone").
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit b44bd1c0488c168d3a0815ad0d375f26ffabe4d8
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Nov 21 11:05:05 2012 +0100
Bug 9123: Authorities search ordered by authid does not work
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested with Zebra, marc21, grs1.
Discovered that paging through auth search results does no longer work, but that is not related to these changes.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Tested with Zebra, marc21, dom.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
commit bd35ea5ff6a750e75b4bcb26a337f8b2f12d05e4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Oct 1 15:16:29 2012 -0400
Bug 5801 - C4::Circulation::_GetCircControlBranch wrongly used in opac-reserve.pl
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests and perlcritic pass.
Tests done:
holds policy vs. circulation rules seemed to make the difference for me,
I am not totally sure why that is, but see no reason to fail this patch as
results are ok.
System preferences
- CircControlBranch = the library the item is from
- ReservesControlBranch = patron's home library
Circulation rules
- Library A - Holds policy: Books can not be put on hold.
- Library B - Holds policy: Books can be put on hold. (no special setting needed)
Catalog data
- A record with an item for library B, itemtype Books.
Test without patch:
1) Patron A (home library A) places a hold in OPAC on an item from library B.
Should be: hold is NOT allowed.
Before patch: hold IS allowed.
After patch: hold is NOT allowed.
OK
2) ReserveControlbranch = item's home library
Patron A (home library A) places a hold in OPAC on an item from library B.
Should be: hold is allowed.
Before patch: hold is allowed.
After patch: hold is allowed.
OK
3) ReservesControlBranch = patron's home library
Circulation rules: Remove hold policy for library B.
Library A: no holds allowed for books using 'Holds allowed (count)' = 0
Library B: 5 holds allowed for books using 'Holds allowed (count)' = 5
Patron A (home library A) places a hold in OPAC on an item from library B.
Should be: hold is NOT allowed
Before patch: hold is NOT allowed
After patch: hold is NOT allowed
OK
4) ReserveControlbranch = item's home library
Should be: hold is allowed
Before patch: hold is allowed
After patch: hold is allowed
OK
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
commit a8a191bcb35c68c1245eb6bdb324cc4316c9dcbb
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Nov 26 10:49:22 2012 -0500
Bug 9137 - Focus when editing/adding new itemtypes/authorised values
This patch adds the "focus" class to the relevant inputs so
that the global staff client JS will move the focus to those fields.
Logic in the authorised_values template puts the focus on the
correct field whether you're adding a new category, a new value,
or performing an edit.
To test, try the following operations:
- add an itemtype
- edit an itemtype
- add an authorised value category
- add an authorised value value
- edit an authorised value value
In all cases the focus should automatically be in the first
form field.
Signed-off-by: Melia Meggs <melia at test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests pass and works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Works well in 3.10.x
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Works well in 3.8.x
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
commit a7277ff28acf5c00b20cecd6bad64932af78b86c
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Oct 31 14:26:31 2012 +0100
Bug 7921: Software error while placing order
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Passed-QA-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
commit 0a23401f38c20682f7fe2f0c88bb86fa6441e0ad
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Thu Oct 18 23:21:25 2012 +0200
Bug 8946: corrections in inc files for UNIMARC coded fields advanced search
In subtypes_unimarc.inc files for opac and staff interface, this patch
- fix 1 wrong code (Frequency-code:i = Other should be z)
- fix the label "Feschrift Ind." to "Literary genre"
- add some values for Material-type index (s, t), Literature-Code (i), ctype (v, w), Type-Of-Serial (e,f,g)
- fix a few typos
- change the order of some values (u values)
To test, check if the new values are visible in the opac and staff interface.
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
-----------------------------------------------------------------------
Summary of changes:
C4/AuthoritiesMarc.pm | 4 +-
C4/Biblio.pm | 7 ++-
acqui/neworderempty.pl | 2 +-
acqui/orderreceive.pl | 4 +-
.../authorities/authority-koha-indexdefs.xml | 1 +
.../authorities/authority-zebra-indexdefs.xsl | 2 +-
.../marc_defs/marc21/authorities/record.abs | 2 +-
.../marc_defs/unimarc/authorities/record.abs | 2 +-
installer/data/mysql/updatedatabase.pl | 1 +
.../prog/en/includes/subtypes_unimarc.inc | 55 +++++++++++---------
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 10 +---
.../prog/en/modules/acqui/uncertainprice.tt | 1 -
.../prog/en/modules/admin/authorised_values.tt | 6 ++-
.../prog/en/modules/admin/itemtypes.tt | 8 ++-
.../prog/en/includes/subtypes_unimarc.inc | 52 +++++++++++--------
opac/opac-reserve.pl | 2 +-
16 files changed, 90 insertions(+), 69 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list