[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.03-12-g1ebaaa8
Git repo owner
gitmaster at git.koha-community.org
Tue Aug 13 18:32:00 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 1ebaaa8c4b3c27afa9fd2ef67a9430fafb82b544 (commit)
via 795c8e9bd0fd2d6669582f12fdcaf3fe28acf553 (commit)
via f141cedcbd1a698a947245f19cabf8b11fd03712 (commit)
via 0880aae24ed0fb3524ef9f9a5c59beced9438a8c (commit)
via b4c18e1ad75ab2743d5ff6ccbe63cc76bd811a4d (commit)
via afbe6a0f2c9b0d37327a57cf72eabfb7eebe156d (commit)
via f40924b317e37757f1e552ab466dc840304c6182 (commit)
from 61cbdb6ac7996d8d2f8045d12ec36c5f3676b694 (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 1ebaaa8c4b3c27afa9fd2ef67a9430fafb82b544
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Jul 17 19:12:34 2013 +0000
Bug 10549: (follow-up) make sure ILS-DI GetAvailability response is emitted as UTF-8
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit da6f2f7a7ddf1126d6e3b02825f0d45948f484fa)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 795c8e9bd0fd2d6669582f12fdcaf3fe28acf553
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Sat Jul 6 23:48:54 2013 +0200
bug 10549: make the ILS-DI services advertise that they return UTF-8
This patch changes a few occurences of ISO-8859-1 to UTF-8
within the XML generation of the ILS-DI module.
To test:
- Activate ILS-DI system preference
- Go to [youropac]/cgi-bin/koha/ilsdi.pl
- Check all examples in the documentation for the correct
encoding
- Check GetAvailability gives you the correct encoding and
check the source for the correct encoding
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 2a1d0fc6d2d2674d4182ed1c6be557b568778834)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f141cedcbd1a698a947245f19cabf8b11fd03712
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Jul 17 18:02:13 2013 +0000
Bug 10515: (follow-up) fix use of GetBranchCategories
Adjusting to reflect the removal of the branchcode parameter
to GetBranchCategories; also filter on the 'searchdomain'
library group type, as appears to have been intended.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 968f337728d1e13040389381fef01adc39e8be5c)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0880aae24ed0fb3524ef9f9a5c59beced9438a8c
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Jul 17 17:27:36 2013 +0000
Bug 10515: add regression tests
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 5aeefa25ac94495afd9a1c7fa5aae3f05a1d1907)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b4c18e1ad75ab2743d5ff6ccbe63cc76bd811a4d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Jun 28 16:07:13 2013 +0200
Bug 10515: make behavior of library category fetchers consistent with other fetchers
The prototype is not consistent, GetBranchCategory should return only 1 result
and GetBranchCategories should not have a categorycode argument.
This patch fixes that.
Test plan:
1/ Try to add/remove/modify a library.
2/ Add some groups
3/ Add these groups to a library
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 ec3735433aed8d2c1a42b7d0758b4405a3aa6b1c)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit afbe6a0f2c9b0d37327a57cf72eabfb7eebe156d
Author: David Cook <dcook at prosentient.com.au>
Date: Fri Jul 5 12:00:36 2013 +1000
Bug 10541: enable cross-browser AJAX in additem.js
Currently, the additem.js is using "indexOf" to search
for a value in an array. While this works in Chrome, Firefox,
and IE > 9, it fails miserably in IE 8 and 7 (which don't have
the indexOf method). This means that users aren't able to add
items using the acquisitions module!
Instead of using "indexOf", we should be using the jQuery function
$.inArray. It was added in jQuery v1.2 (3.8.0 uses v1.3.2 so even
our oldest supported release can use this method). It's perfectly
cross-browser compatible...works in Chrome, Firefox, and every
version of IE that I've tried (i.e. 7, 8, 9).
Test Plan:
Before applying patch:
0) Switch to Internet Explorer 7, or 8, or 9, or 10.
If you're using IE 9 or 10, you'll need to change the Document Mode to
IE7 standards or IE8 standards.
You can do this by opening Internet Explorer 9 or 10, pressing F12 (or
clicking on the gear in the top right corner and choosing
F12 Developer Tools), and then clicking on "Document Mode" on the
top toolbar. There, you can change to IE7 or IE8 standards.
N.B. This is not always a perfect emulation in every case, but this
time it does show you the bug.
1) Set the system preference AcqCreateItem to "receiving an order"
2) Go to Acquisitions
3) Either:
a) Receive a shipment for a basket with items
b) Create a new basket, create an order, close the basket, and
then do 3a)
4) In the "Item" fieldset, fill out some fields such as barcode,
Date acquiried, Public note, etc.
5) Click "Add" at the bottom of the fieldset
6) Note that while the item may have been added, the "Item" fieldset
is not being shown again. You may also notice a Javascript error
appearing in a pop-up window or you might see a yellow warning flag
on the bottom status bar.
APPLY THE PATCH
7) Do a full refresh of the page (hold down shift and press the refresh
button on the browser next to the address bar), and try adding items
again.
8) Note that you receive no warnings and that items are added correctly
as they would be in Firefox or Chrome.
OPTIONALLY
9) To be sure that I haven't broken anything, go through the same steps
in IE9 (with IE9 standards) or Chrome or Firefox. Everything should be
working.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Tested in IE10 in IE7 mode and IE9 mode. Also tested in Firefox.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passes koha-qa.pl, works as advertised.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 53f82b1d7d9b7f06da1032faf0800d624eb4c1d3)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f40924b317e37757f1e552ab466dc840304c6182
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Tue Jul 9 17:38:04 2013 +0200
Bug 9362: fix query that finds upcoming due loans
C4:Circulation:GetUpcomingDueIssues is used in the advance_notices.pl
script. This patch corrects an error in its handling of the maxdays
parameter that resulted in it picking up *all* upcoming due loans and
recently overdue loans.
Test plan :
- Create an issue with a date due in the paste
- Create an issue with a date due in two days
- Launch advance notices with due date in max 2 days : perl misc/cronjobs/advance_notices.pl -c -n -v -m=2
=> You get a warn "found 0 issues"
- Launch advance notices with due date in max 3 days : perl misc/cronjobs/advance_notices.pl -c -n -v -m=3
=> You get a warn "found 1 issues"
Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
I did the following test :
- 1 book to check in 2 days
- 2 books to check in in the past
before applying the patch :
$perl ../misc/cronjobs/advance_notices.pl -c -n -v -m=2
getting upcoming due issues at ../misc/cronjobs/advance_notices.pl line 203.
found 1 issues at ../misc/cronjobs/advance_notices.pl line 205.
I changed the value of "-m" : 0, 1, 2, 3, 4
=> always 1 issue found (the book to check in in 2 days)
after applying the patch :
$perl ../misc/cronjobs/advance_notices.pl -c -n -v -m=2
found 0 issues
for m = 0, 1, 2 => 0 issues
$perl ../misc/cronjobs/advance_notices.pl -c -n -v -m=3
found 1 issues
for m = 3,4,5 => 1 issues (the book to check in in 2 days)
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passes koha-qa.pl, works as advertised.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit ff7f37202949bb6d60cdf30de4e237e6b1de93eb)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 2 +-
C4/Branch.pm | 63 ++++++------------
C4/Circulation.pm | 4 +-
C4/ILSDI/Services.pm | 4 +-
admin/branches.pl | 47 ++++++--------
catalogue/search.pl | 2 +-
koha-tmpl/intranet-tmpl/prog/en/js/additem.js | 4 +-
.../prog/en/modules/admin/branches.tt | 2 +-
koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt | 22 +++---
opac/ilsdi.pl | 7 +-
opac/opac-search.pl | 2 +-
t/db_dependent/Branch.t | 69 ++++++++++++++++++++
12 files changed, 135 insertions(+), 93 deletions(-)
create mode 100644 t/db_dependent/Branch.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list