[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.02-38-g5311ae8
Git repo owner
gitmaster at git.koha-community.org
Tue Dec 30 21:30:12 CET 2014
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.18.x has been updated
via 5311ae87f567c7a48005d0642c86532163b8679d (commit)
via 7eb558531ec8f0ba8f8ba35eabc02970e7590ec4 (commit)
via 1c5919bb40a8e40e67c4bb7563b9d4475562d290 (commit)
via 8a81476a075f5f04aa5fda02bf26abcdbe4cf93a (commit)
via 86886ece19d0e6372a5276132e8c1500883c0ce4 (commit)
via e356c6021454652429b8fae7920e526eec9654d8 (commit)
via b3a20835dd8ba5f08b9b96c3ba36b109492318e7 (commit)
via c68c94454472a63a2bd2324fdbf7443a4508c686 (commit)
from 1312416b0afbfc517233717d60d4aab63d39e73d (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 5311ae87f567c7a48005d0642c86532163b8679d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Dec 10 09:02:57 2014 -0500
Bug 13341 - Hard-coded "Preview" text in OPAC openlibrary.js
The OpenLibrary JavaScript includes an untranslated string, "Preview."
This patch move the string to the template so that it can be translated.
To test, apply the patch and test that the translator picks up the
string:
1. From misc/translator run 'perl translate update [lang]' (e.g. de-DE)
2. Edit misc/translator/po/[lang]-opac-bootstrap.po and add a
translation for the updated "Preview" string
3. Remove the "#, fuzzy" marker from that entry
4. From misc/translator run 'perl translate install [lang]'
5. Enable the [lang] translation for the OPAC in system preferences
6. Enable the OpenLibraryCovers system preference.
7. In the OPAC switch to the [lang] translation.
7. View the detail page for a title for which there is an OpenLibrary
cover image. Below it you should see a preview link with the
translated string you added in step 2.
Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 049bd2da2312b26d0a63adecdc8331e48e3a0efd)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 7eb558531ec8f0ba8f8ba35eabc02970e7590ec4
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Dec 12 12:18:47 2014 +0000
Bug 13447: Fixed HTML Email Reports
A tiny typo made in runreport.pl when updating it for bug 9530 lead to
no body being attached to html emails.
Signed-off-by: Chris <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 36f56b81774340a49f3ad137c77d0d74207acbc1)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 1c5919bb40a8e40e67c4bb7563b9d4475562d290
Author: Lyon3 Team <koha at univ-lyon3.fr>
Date: Fri Dec 5 09:27:02 2014 +0100
Bug 12895 repair dropbox mode
One day late patrons were restricted even with dropbox mode activated
1) Check in the calendar (Tools/Calendar), that the
previous days you are about to use as date due are
really entered as opening day (never know).
2) Add a suspension in the suspension days parameter
of the circulation rules (Administration/Circulation
and fine rules) to the MOST specific category of
borrower and MOST specific type of document among the
existing rules of the LOGGED IN Site(cf explications
in the circ-rules page).
3) Choose a borrower using the search by category and an
item through the advanced search using the limit by type.
4) Checkout the item selecting the previous opening date
in the Specify-due-date box.
5) Click on Circulation in the upper menu, then on Checkin
and check the Book drop mode. The Book drop date showed
should be the previous opening date.
6) Check in the item : you can see that the patron is restricted
7) apply the patch
8) Redo 1 to 5 : Now, you can see that the patron is not restricted.
9) If you redo the test with two day late, you will see that
the patron is not restricted : that's ok because his
restriction of one day is already finished.
10) If you redo the test with more than two day late, you see
that the patron restriction is, as expected, one day shorter
than it were if the item had been returned without dropbox mode.
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit c1621de8a503d5505d0bd697a4b64eacf50c095d)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 8a81476a075f5f04aa5fda02bf26abcdbe4cf93a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Dec 26 10:22:34 2014 +0100
Bug 13458: Display the correct patron categories
Bug 9811 removes useful code.
Actually the AddPatronLists pref is not sent to the template from
members/member.pl.
To fix this issue, we can use the existing not clean way, or compare the
syspref value directly in the template. This second solution is
implemented in this patch.
Test plan:
1/ Set the AddPatronLists pref to 'specific'
2/ On the patron home page (members/members-home/pl), the patron search
result page (members/member.pl after launching a search) and on the
checkouts page/patron search result (circ/circulation.pl after searching
a patron using the check out), verify that the patron category list is
the specific ones.
3/ Test there are no regression with the AddPatronLists pref set to
'general'.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Works as described and fixes the problem.
Note: I am not sure if AddPatronLists makes sense -
if you set it to general patron types, it still preselects the
wrong category type (tried organization, a child patron category
was selected). Also the name is confusiong nowadays with the
Patron list feature.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 2b39823c0f4cec1607078de1f2547afc95ae87cd)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 86886ece19d0e6372a5276132e8c1500883c0ce4
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Nov 29 11:59:45 2014 +0100
Bug 9958: Improve RoutingSerials sys pref description
The RoutingSerials preference controls if the routing
list related functionality is visible in the serials
module.
To test:
- Go to the system preference editor - RoutingSerials
- Check the current description
- Apply patch
- Check the new description
- Verify functionality matches description
NOTE: The preference change is merely cosmetic. The value is
still YesNo. A few git reset --hard origin/master
and page refreshes confirmed expected values.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 90ebffcffae59b5ded2db3dce875be0293b845e1)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit e356c6021454652429b8fae7920e526eec9654d8
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Nov 18 14:07:49 2014 +0000
Bug 13285 Do the right thing if opacthemes is not set
If opacthemes is not defined updatedatabase reports the
subsequent warnings as an error. Take account of the case where
it is not set and default that to bootstrap.
This is probably a rare occurence, but should be handled
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 90c32e88561530143ced5d190445850291f6851e)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit b3a20835dd8ba5f08b9b96c3ba36b109492318e7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Oct 21 06:18:29 2014 -0400
Bug 13124 - Record titles with parentheses causing label weirdness
Test Plan ( using sample data included with Koha )
1) Catalog a record and item with the title "Oh no! or, (How my
science project destroyed the world) /"
2) Edit the DEFAULT template
a) Set layout type to Biblio
b) Set data fields to "title, author, isbn, issn, itemtype,
barcode, itemcallnumber"
c) Set font size to 10
3) Create a batch with just the one item you created
4) Export the PDF with the Avery template and the DEFAULT layout
5) Note the weirdness
6) Apply this patch
7) Re-export the PDF, note it's no longer weird ; )
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit fe4da2f721c371540fe88d0014a49a866b403ca4)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit c68c94454472a63a2bd2324fdbf7443a4508c686
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Fri Nov 28 10:06:18 2014 -0300
Bug 13357: Untranslatable strings on itemsearch.tt
This patch enable translation of labels on itemsearch.tt
To test:
1) Translate for a fairly complete language (es-ES de-DE)
2) On staff, go to Search > Item search
3) Check there are many untranslated strings
e.g. Text before pulldowns on first and second box
All options on third box
4) Apply the patch
5) Repeat 1 & 2
6) Check there are now some strings translated
7) Update translation file, check there are some
new strings to translate (may be they are fuzzy)
e.g. "All statuses", "All collection codes"
Patch works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 1eb85ad7578410354668ff81f9f35bbc2f6b9734)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 5 +-
C4/Labels/Label.pm | 5 +-
circ/circulation.pl | 3 -
circ/returns.pl | 14 +++-
installer/data/mysql/updatedatabase.pl | 2 +-
.../prog/en/includes/patron-toolbar.inc | 2 +-
.../prog/en/modules/admin/preferences/serials.pref | 6 +-
.../prog/en/modules/catalogue/itemsearch.tt | 69 +++++++++++++-------
.../bootstrap/en/includes/opac-bottom.inc | 1 +
koha-tmpl/opac-tmpl/bootstrap/js/openlibrary.js | 2 +-
members/members-home.pl | 1 -
misc/cronjobs/runreport.pl | 2 +-
12 files changed, 71 insertions(+), 41 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list