[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.10-13-g3dec797
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 13 23:05:29 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 3dec7977189b7b8549128e4fec151b7a654d2a3a (commit)
via 7b5141e9501550918741b02b55f1b49706240f7b (commit)
via bcd6b896ea3e10c73cca4b34d9030024205b784b (commit)
via 297e7fa540d8b6eddf5289c37865844dcf258d09 (commit)
via 270cc499c3dde4ef22e395d8dc3f40ebb1e6907e (commit)
via 9643d6ca30315cae2a2732b0bc84e0a63797261a (commit)
via 41f7a40ea7cdcc628b3e369cf8480e6b6e81f030 (commit)
via cca7c4fbde1ba5074937251d9fd3c8b3d86deef7 (commit)
via d92e6c746de1060a34631f4a0eea7bc71b110cd8 (commit)
via 99706d790038e6bc0ea230f803946cd41845ddaa (commit)
via 325d4af93c155ff068a4912ce0435b85fa276ec1 (commit)
via bef4efbdc7e68b1c91b7234ba2d68ff5aeeb5131 (commit)
via fb11fb31a4357777328b80fd5ad6ce5694823d11 (commit)
from d735accceee43deda6ebfd5d6bbde85f949dd4e0 (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 3dec7977189b7b8549128e4fec151b7a654d2a3a
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Jul 22 14:40:58 2013 +0000
bug 7143: add latest batch of committers
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit ee224415b7c8b5e31f9c052e1c14a143ab137898)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 11ad663a50979c2aa20aabaa986a8660381f37c0)
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
Solved minor conflict.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 11ad663a50979c2aa20aabaa986a8660381f37c0)
commit 7b5141e9501550918741b02b55f1b49706240f7b
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Jul 8 13:15:01 2013 -0300
Bug 7143 - Updating history and about page
First commit from Silvia Simonetti, went into the 3.12.x branch.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 224d878cf76813c5f8f229031ef916f1f73fd975)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 53494812ff1b9a00e3d541e4744ccb96ae297fca)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 53494812ff1b9a00e3d541e4744ccb96ae297fca)
commit bcd6b896ea3e10c73cca4b34d9030024205b784b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jul 18 11:30:35 2013 -0400
Bug 7598: [Follow-up] make strings in acquisitions JavaScript translatable
This follow-up addresses QA comments and moves punctuation and line
breaks out of the string to be translated.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b38187d8b004316b17d1e67753d638e96bb62bb8)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit c4bf7d825141261a8a1563790f4e4a767647a779)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit c4bf7d825141261a8a1563790f4e4a767647a779)
commit 297e7fa540d8b6eddf5289c37865844dcf258d09
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Sep 10 08:34:33 2012 -0400
Bug 7598: make strings in acquisitions JavaScript translatable
English strings in acq.js cannot be processed by the translation script.
This patch moves the strings to the templates to be set as JS variables
for use by the script.
To test:
- On the uncertain prices page, enter an invalid price and click save.
You should see a JavaScript alert pointing this out.
- When adding a fund to an existing budget, enter an amount which
exceeds the amount in the parent budget. You should see a JavaScript
alert pointing this out. There is a similar function which has been
corrected, checkBudgetParent(), but I don't know how to trigger it for
testing.
The closebasketgroup function has been updated but as far as I can tell
it's not actually in use.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit f69e13665da007a6ab28e4c1d5a7d1a50f3ac3ac)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit d8eeb697c873b1ba9366bbce275a14d004931f40)
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/js/acq.js
Solved.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit d8eeb697c873b1ba9366bbce275a14d004931f40)
commit 270cc499c3dde4ef22e395d8dc3f40ebb1e6907e
Author: David Cook <dcook at prosentient.com.au>
Date: Thu Jun 27 16:02:08 2013 +1000
Bug 9801: display facet labels in search results only when there are facet values
Currently, the headings for facets (such as location) are showing even
if there are no actual values/links for that facet type.
This patch simply checks if the facet array contains any facets before
printing the heading and HTML for each facet value/link.
Test Plan:
Before applying:
0) If you want to check the location facet (which is easiest),
enable singlebranch mode in the globals system preferences.
1) Do a search for records/items that you have no shelving location
specified (or simply remove the shelving location for a small range
of records that you can find in a search query).
2) Note that "Location" appears amongst the facets even though there
are no values/links present. (If you look at the HTML source, you'll
see some empty HTML tags have been printed out.)
Apply patch.
3) Flush your cache and refresh your page.
4) You should no longer see a "Location" facet (or those empty HTML
tags) on the facet sidebar.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Template changes only.
Checked according to test plan, made sure location facet
still shows up when values exist, otherwise it's hidden.
It might make sense to add ids to the facets so libraries
can decide to hide some of them easily. Or alternatively
add a system preference to make that possible.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit f01606d89b487d585bf06eae1dd6de6ff138eab9)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 8871a6a2add5cbdef3a46267a54fc78ddf995687)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 8871a6a2add5cbdef3a46267a54fc78ddf995687)
commit 9643d6ca30315cae2a2732b0bc84e0a63797261a
Author: David Cook <dcook at prosentient.com.au>
Date: Thu Jun 13 16:46:46 2013 +1000
Bug 10457: fix SQL error when using 'export select items data' in serials claims page
Currently, if you use the "check all" checkbox next to the "Vendor"
table header, and try to "Export selected items data", you'll
see the following SQL error in the Apache error log:
DBD::mysql::st execute failed: You have an error in your SQL syntax;
check the manual that corresponds to your MySQL server version for
the right syntax to use near 'on ORDER BY title' at line 12 at
/.../lib/C4/Serials.pm line 1828.
This is because the Javascript that produces the re-direct URL is
including the value of the checkall checkbox, which is "on",
as a "serialid".
We need to only take checkboxes with a name of "serialid" when
crafting the re-direct link.
This patch adds the [name=serialid] attribute selector to the Jquery
that creates the URL to lateissues-excel.pl from claims.pl.
Test Plan:
Before applying the patch:
1) Go to Serials > Claims (found on the left navigation bar of Serials)
2) Choose a vendor that has serials to claim (or create some late
serials for a vendor so that they will show up)
3) Click on the checkbox to the left of the "Vendor" table heading.
4) Click "Export selected items data" at the bottom of the page
5) Check the Apache error log. Notice that you'll get a SQL error
like the one in the message above.
Apply the patch.
Repeat Steps 1-4.
Note that you should now have a CSV file downloading rather than
getting a SQL error.
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 3834d1f2b4494d465c6d1ab72aa334100898a756)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit fdb1d099c5489f200b7b36125ed4ccddd00e3d4c)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit fdb1d099c5489f200b7b36125ed4ccddd00e3d4c)
commit 41f7a40ea7cdcc628b3e369cf8480e6b6e81f030
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jul 8 14:37:03 2013 -0400
Bug 10553: make public lists available on OPAC login page
If you are not logged in to the OPAC, looking at the login page, and you
click the Lists button to see public lists it says there are none. This
patch corrects Auth.pm so that it loads the list of public lists in this
situation.
To test you must have at least one public list. Make sure you are logged
out of the OPAC and visit the login page (/cgi-bin/koha/opac-user.pl).
Clicking the "Lists" button should show you a list of public shelves.
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
works as described, and list button is not shown when opacpublic is disabled.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 651f810f68f82f4aac254c4a78bb6a4517dcb558)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit c7e19ee643730b06dc0f0ab2665c31f65b8e86e4)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit c7e19ee643730b06dc0f0ab2665c31f65b8e86e4)
commit cca7c4fbde1ba5074937251d9fd3c8b3d86deef7
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Jul 9 17:53:16 2013 +0000
bug 10559: remove spurious "statement handle still active" warnings
Generating (e.g.) overdue notices can result in spurious warnings in
the cronjob logs:
$ ./misc/cronjobs/overdue_notices.pl -t -library CPL
prepare_cached(SELECT * FROM issues WHERE itemnumber = ?) statement handle DBI::st=HASH(0x54a7828) still Active at C4/Letters.pm line 589
This patch removes the warning by making sure that the relevant statement
handle is finished after fetching its first row of results.
To test:
[1] Set up an overdue loan such that running overdue_notices.pl will
trigger the generation of a notice.
[2] Run overdue_notices.pl -t and note the warning message.
[3] Apply the patch.
[4] Run overdue_notices.pl -t again and note that the warning message
is no longer displayed.
[5] Check the message_queue table and verify that the overdue
notices generated in steps 2 and 4 have the same text.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 2bab95cac5f43b034adec36ec62a8c8f7f520627)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 5e7452758949e037fcf286cead721b559dd7d0e3)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 5e7452758949e037fcf286cead721b559dd7d0e3)
commit d92e6c746de1060a34631f4a0eea7bc71b110cd8
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Tue Jul 16 21:51:01 2013 +0200
Bug 10595: don't display OpacTopissue page when system preference is turned off
When the syspref is turned off, the link is hidden but the page is still
accessible. This patch checks the syspref and redirects to 404 if it is disabled.
Test plan:
Before applying the patch
Enable OpacTopissue
Observe there is a link to opac-topissues.pl next to Advanced search etc.
Follow that link, observe that opac-topissues.pl is loading
Disable OpacTopissue
Observe the link is gone
Manually open /koha/opac-topissues.pl and check that it is loading even though the feature is disabled
Apply patch
(OpacTopissue still diabled)
Manually open /koha/opac-topissues.pl and observe that you are being redirected to the 404 page.
Enable OpacTopissue
Follow the link or manuall open opac-topissues.pl and check that it is working
Signoff the patch.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 04ca81bc358f1bc6425e1cef431d9e4abfc744d8)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Works as expected
(cherry picked from commit 094bfd0d17689c92a4e9366af63ffb7fcbe99399)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 094bfd0d17689c92a4e9366af63ffb7fcbe99399)
commit 99706d790038e6bc0ea230f803946cd41845ddaa
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>
(cherry picked from commit 1ebaaa8c4b3c27afa9fd2ef67a9430fafb82b544)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 1ebaaa8c4b3c27afa9fd2ef67a9430fafb82b544)
commit 325d4af93c155ff068a4912ce0435b85fa276ec1
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>
(cherry picked from commit 795c8e9bd0fd2d6669582f12fdcaf3fe28acf553)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 795c8e9bd0fd2d6669582f12fdcaf3fe28acf553)
commit bef4efbdc7e68b1c91b7234ba2d68ff5aeeb5131
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>
(cherry picked from commit afbe6a0f2c9b0d37327a57cf72eabfb7eebe156d)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit afbe6a0f2c9b0d37327a57cf72eabfb7eebe156d)
commit fb11fb31a4357777328b80fd5ad6ce5694823d11
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>
(cherry picked from commit f40924b317e37757f1e552ab466dc840304c6182)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit f40924b317e37757f1e552ab466dc840304c6182)
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 8 ++++++
C4/Circulation.pm | 4 +-
C4/ILSDI/Services.pm | 4 +-
C4/Letters.pm | 1 +
docs/history.txt | 4 +++
.../intranet-tmpl/prog/en/includes/facets.inc | 2 +
koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 24 +++++++------------
koha-tmpl/intranet-tmpl/prog/en/js/additem.js | 4 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 5 ++++
.../prog/en/modules/acqui/basketgroup.tt | 6 +++++
.../prog/en/modules/acqui/uncertainprice.tt | 1 +
.../prog/en/modules/admin/aqbudgets.tt | 8 ++++++
.../prog/en/modules/serials/claims.tt | 5 +--
.../opac-tmpl/prog/en/includes/opac-facets.inc | 2 +
koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt | 22 +++++++++---------
opac/ilsdi.pl | 7 +++--
opac/opac-topissues.pl | 7 +++++
17 files changed, 76 insertions(+), 38 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list