[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.07.1-54-gd099dbf
Git repo owner
gitmaster at git.koha-community.org
Thu Dec 31 19:20:27 CET 2015
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.20.x has been updated
via d099dbfc8ae9faa9d167f683f730e2d52b75b049 (commit)
via 60463a462a412cdb350c6d10fa8bb54e37944789 (commit)
via 43dd07d73a4df740f936e19f309ff1192d301e25 (commit)
via b7604623e781bf464d19ae9fe82011a9e3a66b1d (commit)
via 02b5de577289a3b3570cabcbb421dbe22065a73c (commit)
via 92afa30088989511f8596c8405ab863093467f1b (commit)
via 1eec7a8355c7e1d7eade6717e702d8cfb12c0237 (commit)
via 7ccaea4a460cd7cd02085eee520fdc9760243683 (commit)
via f1a38798a64ac97226b617dd9ef7b38dcca39b66 (commit)
via 3719d3383f10a08ee872593f94b18647ca0e5d8f (commit)
via 05d306c5f84b46ce6edf170a44f02e0203ab98f0 (commit)
via 8ccca1461003af58c6c54eefdb351ec758763d4a (commit)
via 2cf5836c20b421906910cfafed272dfe8a0c6bf5 (commit)
via 0895ca8c31e5aedd31e44218b952738c9fffed21 (commit)
via a7d0a998bcfe408c50a5e857ef9b2df7563bd267 (commit)
via 4ad5decf4a06abd043566c5a5a6412133139de29 (commit)
via bad4e3795037917786bfb2fd6fef3891fcb00f36 (commit)
via d5a1eae1f679893950f26a0fe0f90df5b66638ff (commit)
via 3c16c8423beaf538cd7a930480aba9ddbabe8632 (commit)
via 836958ad607ffe439580401f7a9bba623f72cc71 (commit)
via 3b8e973d9ced0d5f89cd8719b4686dadd934e683 (commit)
via 6cab2b5b1c9dcd7373abde8f8b19be145fbfb51b (commit)
via c7db8a68f0a49dfc0f3fe421bcacd761e4fd65c0 (commit)
via f7c6e9f586667ea5dfdd5dd08a05ccb799e1d424 (commit)
via d4bcfef9d1aaa8048b91fbe1f1b9b51a09be2703 (commit)
via 002e33b37a6d4bc321d13bdd8f1d5b185a4fe11c (commit)
via c80033b27710254c0a5e6f9b69ecbaf378be9402 (commit)
via 706ab6c926bfaed5c79412e9cadfe2e5dd7cd9f4 (commit)
via e491ba33c888a1f0271ddb9c5f48a022d421b0c3 (commit)
via c9b64dc5ecb92659227c707a53ceabab9ec0c5c3 (commit)
via deef37d65ef28e525a4a23bb1d9ff14f8bbc2c66 (commit)
via 33137f4bddc00722c3dd61e7c4d1955d71a0edb2 (commit)
via 9aec475b0570b970898dd4cc25efa7a33f5c7017 (commit)
via 90e1ee89cd6627305777abf36383a3931bb38368 (commit)
via a6c630aec677c957f8eb0f73e0eb2ca9f52129ba (commit)
via 0447edf9e3c6373d08d16957ea33fd6163974db5 (commit)
via e372febf1e352f3388c3f3e347a8c5a23f0b36a0 (commit)
via 0eab9d32bd1f8849f36bf6c9e4ddff531d3d4686 (commit)
via 61195220473a6b7b62bcdfadadcdf2cd3e51af9d (commit)
via 0bf604f023bad9d7cb96df82c7b8da6b288840cf (commit)
via 42315be031b89de88bed284376dea2dd8005c834 (commit)
via a2c9af33a49e992a055ebf0482d82124c02ed317 (commit)
via 99d8a586bbd93352ee5c875eecbd0beec8b7b3b3 (commit)
via a62b8a526ca282d724e44c34e47c9e63f9e385ae (commit)
via 26fd2156293f3b3ea9d460b437bcd5f08879bf54 (commit)
via 519dd299436097e44278f392238663f15b90146a (commit)
via 8c404db64ed99c99596d55440637d94166806a20 (commit)
via 98937fa5bcd209bf8f8f642fe031edd03de23d73 (commit)
via 4448c38763c94415c64f51b2de6cda90a88fc6c0 (commit)
from 13239b15a56822beef510feb7cd08bba8e51265d (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 d099dbfc8ae9faa9d167f683f730e2d52b75b049
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Thu Dec 31 19:25:10 2015 +0100
Bug 15429 Followup to avoid test failing
commit 60463a462a412cdb350c6d10fa8bb54e37944789
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date: Mon Dec 7 13:15:04 2015 -0600
Bug 13136: Add missing help file for label-manage.pl
This patch adds in a help file for the new label-manage page.
To test:
* visit label creator
* click manage and choose an option
* click 'help' and confirm the file loads
* repeat for all options under manage
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised. Tab char corrected
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
(cherry picked from commit 8a02409d180d4e4be8a2d9bef6be5373a8b1a907)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 1dcb57f84e8fa84a80f53be2bbcc0078d232eaed)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 43dd07d73a4df740f936e19f309ff1192d301e25
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date: Thu Oct 29 15:40:50 2015 +0200
Bug 15080 - ./translate tool should tell if xgettext executable is missing
Just upgraded our Koha container to 14.04 and noticing the
misc/translator/translate doesn't work. This is because of a missing
package gettext.
This patch makes ./translate die with a helpful suggestion to install
gettext if xgettext-program is missing.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
I can reproduce the bug by desinstalling 'gettext' package on a Debian
box. I confirm that without this patch, 'translate' command fails
miserably. Suggesting to install gettext package is welcomed.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
(cherry picked from commit 37b0e2ce9cbc4ba5070d22c96b357ddea1db084b)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 52a9bed15f91699981b27cc78fee54fd9bd378df)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit b7604623e781bf464d19ae9fe82011a9e3a66b1d
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Fri Dec 18 10:24:29 2015 +0100
Bug 15396: fix MARC21 Leader plugin label '1-4 Record size'
The plugin label says "1-4 Record size", but it's actually 0-4.
http://www.loc.gov/marc/bibliographic/bdleader.html
Test plan:
-apply patch
-in cataloging, open a record in a framework that uses the plugin
-open LEADER/000 and check that the label says "0-4 Record size" now
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Good catch, fixed tab, no errors.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 4e61aa5ef55e214e60920eb3556f0c96dbe3e23a)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 2763eb87de9a234d0ba8e84042ed26bfa7fbdadc)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 02b5de577289a3b3570cabcbb421dbe22065a73c
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Nov 22 02:52:02 2015 +0100
Bug 14853: Change 'Fund' to 'Shipping fund'
Changes the 'Fund' to 'Shipping fund' so it's clear
what the fund setting is used for.
To test:
- Receive a new shipment
- Verify that 'Shipping fund' displays on the parcels page
- Search for your invoice
- View invoice details
- Verify that 'Shipping fund' displays on the invoice page
Followed test plan (changed lines: '...cost' -> '...fund')
Display OK on both places.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 3f68107b1012e47467d1fb96b44347499332ba22)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 855cd2a40080a39eeb35d3977a62c0f6909e5218)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 92afa30088989511f8596c8405ab863093467f1b
Author: Marc Véron <veron at veron.ch>
Date: Wed Dec 9 16:10:10 2015 +0100
Bug 15340: Translatability: fix issue with 'or choose' splitted by <strong> tag
This patch fixes a translatability issue due to <trong> tags.
To verify:
- Make sure that you have some entries in 'Cities and Towns'
( Home > Administration > Cities )
- Edit the main address of a patron's details
- Locate field "City", at the right you have the text 'or choose'
followed by a drop-down ('choose' is bold)
- change language e.g. to German, the text reads 'or auswählen'
(instead of 'oder auswählen')
- This is due to the <strong> tags around 'choose'
To test:
- Apply patch
- Verify that the <strong> tags around 'choose' are removed in:
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Obvious issue/solution
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit a85fd85545a885e8ebbcc417b7f180baede70304)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit e33bcec68855397ca16f352ff63c85e3789bea36)
commit 1eec7a8355c7e1d7eade6717e702d8cfb12c0237
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Dec 22 15:37:41 2015 +0000
Bug 15409 - Plugins section missing from Admin menu sidebar
The sidebar menu in the Admin area of Koha is missing a section for
Plugins.
Test Plan:
1) Apply this patch
2) Log in with a user that has plugin permissions
3) Browse to a page with the admin menu sidebar, such as
/cgi-bin/koha/admin/transport-cost-matrix.pl
4) Note the new Plugins section with a link to manage plugins
5) Log in with a user that has no plugin permissions
6) Revisit the same page, note the Plugins section is no longer visible
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 65d3203525470d8b0b44374bdc66b979de57c426)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 2f7f6e9ac01476e4a7a6acee829a1fc33985c2a2)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 7ccaea4a460cd7cd02085eee520fdc9760243683
Author: Marc Véron <veron at veron.ch>
Date: Mon Dec 28 16:00:54 2015 +0100
Bug 15432: t/db_dependent/Letters.t depends on external data/configuration
To test:
- Set system preference LetterLog to 'Don't log'
- prove t/db_dependent/Letters.t
- Result: Fails on test 62 - Successfully sent claim
- Apply patch
- Test again
- Result: Pass OK
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Amended patch: removed the bug reference, not needed.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit c92b1556ef9250d7e038dce2d083c60415035b95)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 99fc3af0a6b13b83ada683cccce025c0c0dbc224)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit f1a38798a64ac97226b617dd9ef7b38dcca39b66
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Sun Dec 20 19:57:54 2015 +0000
Bug 15373: More changes of Zip to ZIP on intranet
To test:
- Log in to Staff Interface, go to Administration, Libraries and Groups (cgi-bin/koha/admin/branches.pl). Click 'New library' and confirm that it says 'ZIP/Postal Code:' in the form.
- Go back to Administration, Cities and towns (cgi-bin/koha/admin/cities.pl). Confirm it says 'ZIP/Postal code' in table heading. Click 'New city' and confirm it says 'ZIP/Postal code:' in form
- Go back to Administration, Global system preferences, I18L/L10N (cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n). Under AddressFormat, confirm all available options say '[ZIP/Postal Code]'
- Go to Reports, Patrons (cgi-bin/koha/reports/borrowers_stats.pl). Confirm it says 'ZIP/Postal code' under Title
- Go to Tools, Batch patron modification (cgi-bin/koha/tools/modborrowers.pl), enter any card number and click 'Continue'. Confirm it says 'ZIP/Postal code' in the table of patron details, and in the form to edit
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
NOTE: Tested together with first patch.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 5df49b04ef69ad6b33b3f7744acb379c0dd83b0f)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 776f738382010f2d9ce8eef7efc73ed5fca45d6c)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3719d3383f10a08ee872593f94b18647ca0e5d8f
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Mon Dec 14 22:43:26 2015 +0000
Bug 15373: Changing Zip to ZIP on OPAC and Intranet
To test:
1) Login to OPAC --> You personal details.
2) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact
3) Login to Staff interface --> Go to a member's page (ie koha/members/memberentry.pl) --> Details.
4) Ensure it says 'ZIP/Postal Code' under Alternate address and Alternative contact
5) Click Edit
6) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact
Signed-off-by: Barry Cannon <bc at interleaf.ie>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
NOTE: Tested together with second patch.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 3da8abcfeff331d5022ee54bbf27ecfbc4ebe18c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 6438df72872d88c263b4fa331c2d44adb0ac2fa4)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 05d306c5f84b46ce6edf170a44f02e0203ab98f0
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Dec 15 10:15:25 2015 -0500
Bug 15382: 245$a visibility constraints not respected in opac-MARCdetail.pl
This tiny change determines if the bibliotitle should be set or not
in accordance with the 'Advanced constraints' visiblity setting for
OPAC.
TEST PLAN
---------
1) Find a record detail in OPAC
2) Click 'MARC view'
-- 245$a should be visible.
3) In a new tab, log into the staff client
4) Click 'Koha administration'
5) Click 'MARC bibliographic framework'
6) Click 'MARC structure' for the framework of
the record displayed in OPAC.
7) Search for tag: 245, and click 'Search'
8) Click 'Subfields'
9) Click 'Edit' beside the a subfield.
10) Click 'Advanced constraints'
11) Uncheck 'OPAC'
12) Click 'Save changes'
13) In the OPAC tab, refresh
-- 245$a (Title) will still be visible!
14) Apply this patch
15) In the OPAC tab, refresh
-- 245$a (Title) will be hidden.
16) In the staff client, navigate back to
'Advanced constraints' and check 'OPAC'
17) Click 'Save changes'
18) In the OPAC tab, refresh
-- 245$a (Title) will be visible again.
19) Run koha qa tools
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit d827bb50d93a83c0ab7ce326675284bee411959a)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 7f708a361b95c449a972b8571acde4c52d3f336b)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 8ccca1461003af58c6c54eefdb351ec758763d4a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Dec 4 20:37:47 2015 -0500
Bug 15327: Minor tweaks to Bootstrap modal handling on Staged MARC management page
This patch makes a couple of minor corrections to the template for
staged MARC management. The MARC preview is now formatted using the
"html" option, and some obsolete Greybox-related code has been removed.
To test:
1. Apply the patch and go to Tools -> Staged MARC management.
2. Click any staged MARC file containing multiple records.
3. Click the title in the "Citation" column and confirm that a Bootstrap
modal is triggered showing the correct data.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Modal looks much better. Works as advertised
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 23c7de2bc7af7d2d8bf725e536f665bf78116065)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 53cebcb07d8e5c58aa4f9e9da25e9be11444ee51)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 2cf5836c20b421906910cfafed272dfe8a0c6bf5
Author: Nicholas van Oudtshoorn <vanoudt at gmail.com>
Date: Tue Dec 22 11:44:13 2015 +0800
Bug 15405 - XML paths to zebra libraries is wrong for 64-bit installs on non-Debian linux
Adjusts the modulePath to search in the well-known location for 64 bit
systems. Required for at least Fedora.
Test plan:
Without this patch, doing a zebra reindex on a fedora-based install will
cause errors like this:
15:10:47-01/05 zebraidx(16108) [warn] No such record type: dom./etc/koha/zebradb/biblios/etc/dom-config.xml
With this patch, reindexing should just work.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
I have tested this doesn't break on debian/ubuntu systems, someone with
a non debian system will need to test it on that
Signed-off-by: Bob Ewart bob-ewart at bobsown.com
It works on openSUSE Leap 42.1
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Just noting that the debian zebra files already contain much more paths
here.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 3d7bb7647dd42f9c05e8b4c35ec32cd15ec4dcc4)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 9c302d9c09c2c30824c3e4a1c934a5c76883cb4c)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 0895ca8c31e5aedd31e44218b952738c9fffed21
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Wed Dec 30 13:10:16 2015 +0100
Bug 15429 UT for _parseletter modifying its parameter
Before/after applying the related patch, do:
prove -v t/db_dependent/Letters.t
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit fd07e3296b64a78edf1cf947a824147f1adbba1a)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 2eac97ba65d869f34641f6eb7fd22047a104a794)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit a7d0a998bcfe408c50a5e857ef9b2df7563bd267
Author: Marc Véron <veron at veron.ch>
Date: Mon Dec 28 10:29:17 2015 +0100
Bug 15429 - sub _parseletter should not change referenced values
In C4/Letters.pm, sub _parseletter changes values that are passed by
reference. E.g. patron's expiry date can change from iso format to
syspref format, leading to strange behaviour in the calling routines
(see Bug 15423).
This patch makes sub _parseletter work on a copy of the referenced values.
(Submitted to get feedback - is this the way to go?)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Good solution to real time bomb.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 002a2dcb1f1faed12a24fd820dc5fdaad60f3512)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit cc3b2d05905b8c6c7000a0252e277c151c0eeae6)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 4ad5decf4a06abd043566c5a5a6412133139de29
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Nov 25 14:02:05 2015 +0100
Bug 15252 - Add tests
Tested 4 patches together, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit f0da781368a187337236d64ee94d9c8cc65f90f7)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 638a6343f653fdf0a04504ada952d01978d4733a)
commit bad4e3795037917786bfb2fd6fef3891fcb00f36
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Nov 25 12:34:18 2015 +0100
Bug 15252 - Patron search on start with does not work with several terms
When searching a patron, search type can be 'start with' and 'contain'.
If the search text contains a space (or a coma), this text is splitted into several terms.
Actually, the search on 'start with' with several terms never returns a result.
It is because the search composes an "AND" SQL query on terms.
For example (I display only the surname part) :
search type = contain :
'jean paul' => surname like '%jean% AND %paul%'
search type = start with :
'jean paul' => surname like 'jean% AND paul%'
The query for 'start with' is impossible.
I propose, for search with start with, to not split terms :
jean paul => surname like 'jean paul%'
One can always use '*' to add more truncation :
jea* pau* => surname like 'jea% pau%'
This bug affects a lot surnames with several terms like 'LE GUELEC' or 'MAC BETH'.
Note that the patch moves :
$searchmember =~ s/,/ /g;
It removes the test "if $searchmember" because $searchmember is tested and set to empty string previously :
unless ( $searchmember ) {
$searchmember = $dt_params->{sSearch} // '';
}
Test plan :
==========
- Create two patrons with firstname "Jean Paul"
- Go to Patrons module
- Choose "Starts with" in "Search type" filter
- Perform a search on "Jean Paul"
=> without patch : you get no result
=> with this patch : you get the two results
- Check you get the two results for search on "Jean Pau"
- Check you get the two results for search on "Jea* Pau*"
- Check you do not get results for search on "Jea Paul"
- Choose "Contains" in "Search type" filter
- Check you get the two results for search on "Jean Paul"
- Check you get the two results for search on "Jean Pau"
- Check you get the two results for search on "Jea* Pau*"
- Check you get the two results for search on "Jea Paul"
- Check you get the two results for search on "Paul Jean"
Signed-off-by: Alex <alexklbuckley at gmail.com>
Tested 4 patches together, works as expected
Signed-off-by: Marc Véron <veron at veron.ch>
Bug 15252 - Patron search on start with does not work with several terms - followup 1
'start_with' is the default value of $searchtype, it can be explicit.
Tested 4 patches together, works as expected
Signed-off-by: Marc Véron <veron at veron.ch>
Bug 15252 - correct UT searchtype value is contain and not contains
Tested 4 patches together, works as expected
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit a4f5564c855e31f6872fb5e3ef378381473f837c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit db50ac5b8c6c72d15f4c5e2a96544abde432b0f6)
commit d5a1eae1f679893950f26a0fe0f90df5b66638ff
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 2 11:38:27 2015 +0000
Bug 14636: Remove debug message
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 9b9fb3ee0555cd51007af669f753f0a0e5ec661e)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 05e70e2e48d37ae0c68fcb82117e3d120710810f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3c16c8423beaf538cd7a930480aba9ddbabe8632
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Nov 25 18:00:33 2015 +0100
Bug 14636: Follow-up - fix typo in system preference name
The preference is named "marcflavour" not "marcflavor".
Without this change, search will always use "copyrightyear"
and break search by publication date for UNIMARC.
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 99a1d7f18a43a089d49d36b167cc1537fa058f79)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 42f3e0d9ed845a8b44ac0bc3f8d5153811acab34)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 836958ad607ffe439580401f7a9bba623f72cc71
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Nov 25 17:06:01 2015 +0100
Bug 14636: Item search - biblioitems column is publicationyear not publicationdate
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Thx for the follow-up!
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 2d0d71730163fbd13583532de622574737e34221)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 5c945298900413b7807fe1f1e79694feafba31f1)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3b8e973d9ced0d5f89cd8719b4686dadd934e683
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Nov 21 22:37:03 2015 +0100
Bug 14636: Item search - improving display
- Changes "Publication Date" to "Publication date"
in the CSV export
- Fixes 'no JavaScript fallback' display to match
the normal display
- only show 'by' when it's UNIMARC and an author
exist
- show copyrightdate if publicationyear is empty
To test:
- Turn of Javascript in your browser before you
item search. This will activate the alternative
display.
- For MARC21:
- Verify that the author displays when existing
and no 'by' is shown.
- Verify that the publication date is now shown.
- For UNIMARC:
- Verify that 'by' only displays when there is
an author to display.
- Verify that the publication date is still
shown.
- Try the CSV export.
- Verify that the CSV header now reads 'Publication date'.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Successfully tested non-JS behavior and CSV export. DID NOT test
UNIMARC.
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 2aa6518c8a000a824e2659eaffc3d1ac54156544)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 704e932d648c66ad81c0f79d8ae6b388595bcbcf)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 6cab2b5b1c9dcd7373abde8f8b19be145fbfb51b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Nov 21 22:32:52 2015 +0100
Bug 14636: Item search - fix search and sort by publication date for MARC21
Problem: MARC21/NORMARC stores the publication
date in biblio.copyrightdate, but UNIMARC uses
biblioitems.publicationyear.
To test:
- Without patch in a MARC21 installation:
- Search by publication date
- Verify that the results don't match the
publication year you searched for.
- Try sorting the table by publication year.
- Verify that the sort doesn't work.
- Apply patch.
- Repeat both, search and sort.
- Verify both work correctly now.
- Repeat tests on a UNIMARC installation.
- Verify both still work.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Tested searching and sorting successfully in a MARC21 installation. DID
NOT test in UNIMARC.
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 0d2e83bca5b91376e9262b6cb0b993f09b919018)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit d772f8732c9623e246a0fad33fef5282c044f368)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c7db8a68f0a49dfc0f3fe421bcacd761e4fd65c0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 9 17:41:04 2015 +0000
Bug 15344: Remove some other calls of GetMemberDetails from pl scripts
Same as previously.
For these files it's a bit less obvious.
To make sure these changes won't introduce any regression, check that
the variable returned by GetMember is never used to get something
else than a borrower fields.
The 'flags' should not be get neither.
For opac-user.tt it's different, other keys are got but there are defined
in the pl script.
On the way:
- 'showname' is removed (never used)
- fix scope var issue in opac-user.tt (BORROWER_INF.OPACPatronDetails vs
OPACPatronDetails)
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 010a32d95f871853f5c597b2670f3de4c62cfa51)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 95e9dafa38bf6f895cf62feac1df20e3b67a0640)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit f7c6e9f586667ea5dfdd5dd08a05ccb799e1d424
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 9 17:00:10 2015 +0000
Bug 15344: Remove unucessary call to GetMemberDetails
This subroutine does a lot a processing and should only be called when
necessary.
In the get_template_and_user subroutine (so called from any pages of
Koha), it is call to pass the branchcode, title, firstname, surname and
borrowernumber values for the logged in user.
This subroutine calls GetMemberAccountRecords which retrieve the items
infos for all accountlines entries of the logged in user.
On members/members.pl, let's say you have 74 entries in the accountlines
tables, the page will execute 115 SELECT instead of 35 if you don't have any
accountlines entries.
With this patch, the number of SELECT is always 31.
To test this patch you should have technical skills to know what to do.
Note that USER_INFO was an array of... 1 element. Now it's a hashref.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ac541e0fa1c11254e110d94eed64c358e02e8aab)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 44202df6acdfcfb371eccc6b8e8007a871304e49)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit d4bcfef9d1aaa8048b91fbe1f1b9b51a09be2703
Author: Marc Véron <veron at veron.ch>
Date: Sun Oct 4 11:38:03 2015 +0200
Bug 14948 - Display amounts right aligned in tables on patron pages
This patch set display amounts for charge, fine, price etc. right aligned in tables
on patron pages.
To test, apply patch and verify that amounts appear right aligned on following pages:
- Go to Home > Patrons, perform a search (Column 'Fines')
- Go to a patron with fines and credits
- Checkout tab (circulation.pl): Columns 'Charge', 'Fine', 'Price'
(maybe you have to show column with 'Show / hide colums')
- Fines Tab > Pay fines (pay.pl): Columns 'Amount', 'Amount Outstanding'
- Fines Tab > Account (boraccount.pl): Columns 'Amount', 'Outstanding'
Note: Test here 'Filter paid transactions' as well
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 1acc6094be7670c180bc006182a0f8e464abac03)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit fdb0cc80dbd323f8b7d60bb57af1e9bc6d126086)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 002e33b37a6d4bc321d13bdd8f1d5b185a4fe11c
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Sun Dec 13 22:24:05 2015 +0000
Bug 14153: Noisy warns in admin/transport-cost-matrix.pl
To test:
1) Go to Admin -> Transport cost matrix
2) Notice the warns in the error log
3) Apply the patch and refresh page
4) Notice page still works but no warns in error log
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Amended patch: Init a $op variable, if it must be reused later.
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 825d68ee8696a2c3f3a2a95c0d148015f02a5ae9)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 21465d93d57b197429ebf33d753b9d971e82bac3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c80033b27710254c0a5e6f9b69ecbaf378be9402
Author: Nick <nick at bywatersolutions.com>
Date: Wed Nov 18 11:49:15 2015 -0500
Bug 15210 - Novelist throws an error if no ISBN
This patch makes opac-detail.tt check for an ISBN before attempting to load
Novelist content and prevents a js error which breaks other code.
To test:
1 - Enable novelist
2 - Add a visible change to OPACUserJS eg: $(document).ready(function()
{$("body").css("background-color","pink");}); 3 - Load a record with no ISBN
4 - Note you do not see a color change in the body and that there is an error
in the console 5 - Apply patch
6 - Reload the record
7 - You should see the color change and no error in the js
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 65c5fa4385a8e080cfd46a8197b4417bcd579b6a)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 77bd7557fa7adb196ed46fd7ae3ceea98db3a67c)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 706ab6c926bfaed5c79412e9cadfe2e5dd7cd9f4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Dec 30 14:26:35 2015 +0000
Bug 15442 - Checkouts table will not display due to javascript error
Uncaught ReferenceError: AllowCirculate is not defined
Test Plan:
1) Go to circulation.pl for a patron, note the checkouts table
does not load
2) Apply this patch
3) Reload the page, checkouts table should show
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit c7339799ff994fffdb9273bd71951f8c2d60d1ec)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 14ee2557daafbb67b3afa541fc69f60fa21e7229)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit e491ba33c888a1f0271ddb9c5f48a022d421b0c3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 18 15:01:15 2015 +0000
Bug 15332: Sent DateTime object to DBIx::Class, not formatted dates
If formatted dates are sent to DBIx::Class on update/insert, the date
will be set as 0000-00-00 (except if the format is yyyy-mm-dd).
Test plan:
Use the batch patron modification tools to update the dateenrolled or
dateexpiry values for at least 1 patron.
Without this patch, the modified value will be updated to 0000-00-00,
with this patch, the correct value will be set.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit af7fb9cd48cdb47329e7b9bbe651e856e017aa13)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit d5fd02e4a17383e984c31e427dc2c64ce4726b51)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c9b64dc5ecb92659227c707a53ceabab9ec0c5c3
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu Nov 19 14:17:10 2015 +0000
Bug 15217 Remove redundant duplicate var declaration
remove superfluous second declaration of template, borrowernumber and
cookie which are never used
Also removed the variables @results and @results_array which are
declared but not used
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
As suggested by Colin, perl -wc catalogue/search.pl doesn't complain
anymore after applying the patch. perlcritic confirms the 2 variables
were unused.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 558f291465d60c082c0e9a4a15eb7ed87a3e3fde)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 141f30d406671330bf31b199b4cdb78414176111)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit deef37d65ef28e525a4a23bb1d9ff14f8bbc2c66
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date: Sun Nov 22 19:52:39 2015 -0600
Bug 15228: Switch "Items in batch number"
Yet another line to switch "Items in batch number" to
"Patrons in batch number"
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit e89714ea84acd8300a629a7acccc6eee90ff0ff0)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 008e3805ff1f6b59422286a33b55f4b509edca87)
commit 33137f4bddc00722c3dd61e7c4d1955d71a0edb2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 25 16:45:50 2015 +0000
Bug 15101: Correct typo AllowPkiAuth vs AllowPKIAuth
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit d36280e36e1fa8779bf845fb0cc0de2ea835d486)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 87ce8e85ec6d4c8a447a4d595bf3b975a9ea3cb3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 9aec475b0570b970898dd4cc25efa7a33f5c7017
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Nov 22 02:43:36 2015 +0100
Bug 15101: Don't display sys pref AllowPkiAuth under CAS heading
The system preference AllowPkiAuth display under the heading
CAS authentication, but is actually a separate authentication
option. Patch creates a separate heading for it.
To test:
- Go to Administration > System preferences > Tab Administration
- Verify that AllowPkiAuth is now displayed separately
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit cee796629fb131966a8ebfa77ecbcf054c46fd02)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 30bfb13466e875205f8052590e800247fb263952)
commit 90e1ee89cd6627305777abf36383a3931bb38368
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 25 16:14:35 2015 +0000
Bug 15229: Same fix for circulation.tt template (normal checkouts)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit acf586a45ab4a27939f0ba34cba58ae8ff500993)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit b1e931f7bbcc7e9c0b03ca59a96fc0a67027191c)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit a6c630aec677c957f8eb0f73e0eb2ca9f52129ba
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date: Thu Nov 19 09:31:01 2015 -0600
Bug 15220: Fix typo in circ rules help
MaxFinesystem should be MaxFine system
To test:
* visit circ & fine rules
* click help
* confirm typo fixed
Signed-off-by: Thomas Misilo <misilot at fit.edu>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 391c8ec0bc682491faaf64494867237dfc01bd11)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit a55557afc0f410da4b106e71362801036774c4c4)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 0447edf9e3c6373d08d16957ea33fd6163974db5
Author: Marc Véron <veron at veron.ch>
Date: Sat Nov 21 03:25:56 2015 +0100
Bug 15238: Better translatability for Installer Step 1
This Bug streamlines html in installer/step1.tt for better translatibility.
To test:
Reviwe code and verify that changes in text make sense.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
To reproduce in Debian environment, remove a required module with
dpkg -r. Rewording Ok for translation purposes
Bug 15238: (followup) Remove word 'Note:'
'Note: ' removed as requested in comment #3
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Word 'Note' removed
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 29a4300c0727b779e1a0e83a35cd772828debde2)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 8a7bd3aa361ce707fd5e9fd478c7d7bbd0647312)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit e372febf1e352f3388c3f3e347a8c5a23f0b36a0
Author: Marc Véron <veron at veron.ch>
Date: Sat Nov 21 03:09:55 2015 +0100
Bug 15237: Quote of the day: Better translatibility for editor and help
This patch moves html markup out of explanatory text in Quote of the day editor and help
for better translatibility (Home > Tools > Quote Editor).
To test:
- Apply patch
- Go to Home > Tools > Quote Editor and related Help
- Verify that text changes make sense.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Rewording Ok for translation purposes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Amended patch: Make consistent space after "Note:" (inside the br tag)
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit b0e833f9f5bffeb0940dd75eae150a247b5b520c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 53f4b7241c27b36b52571f14d3b1186e6b401c01)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 0eab9d32bd1f8849f36bf6c9e4ddff531d3d4686
Author: Marc Véron <veron at veron.ch>
Date: Sat Nov 21 02:32:30 2015 +0100
Bug 15236: Better translatibility in "Connect biblio.biblionumber to a MARC subfield"
This patch moves html markup out of explanatory sentence in koha2marclinks.tt ("Connect
biblio.biblionumber to a MARC subfield") for better translatability.
To test:
- Apply patch
- Go to Home > Administration < Koha to MARC mapping
and edit a tag
- Verify that text change makes sense
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Rewording Ok for translation purposes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit f9586b01998071ddfdfc130ead2f48b079ae7e68)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit ae929c528367c135317d3058794028067b97ac90)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 61195220473a6b7b62bcdfadadcdf2cd3e51af9d
Author: Marc Véron <veron at veron.ch>
Date: Thu Dec 3 00:10:28 2015 +0100
Bug 15233: (followup) Remove 2 sentences.
This patch removes 2 sentences (see comment #8)
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 8f77dc86cec51f0f4eea1d627d82fd6b17499060)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 722b953d0c8a8d907333e1cda43e6ed45c02b91e)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 0bf604f023bad9d7cb96df82c7b8da6b288840cf
Author: Marc Véron <veron at veron.ch>
Date: Sat Nov 21 02:10:24 2015 +0100
Bug 15233: Cataloging subfield editors: Clean up html and streamline text for better translatability
This patch removes bold markup from explanatory text in auth_subfields_structure.tt
and makes it the same as in marc_subfields_structure.tt for better translatibility.
To test:
- Apply patch
- Verify that string changes make sense and that the explanatory text is the same in both files.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Rewording Ok for translation purposes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 9b0d9a186a7bffc16af2e5b2f67de31eb468a7a5)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit e10046a351ed9681a18b5eaf21ba320f833b057e)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 42315be031b89de88bed284376dea2dd8005c834
Author: Marc Véron <veron at veron.ch>
Date: Wed Dec 2 06:33:32 2015 +0100
Bug 15231: (followup) Remove stray </b> tag
This patch removes a stray </b> tag (see comment #4) and a superfluous blank.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit ea0d5aa6bf7b0ff96fc75f04d6cb83dc37d4136a)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 78f47f5dc89699aa388b915a3cad81cf375f2fbc)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit a2c9af33a49e992a055ebf0482d82124c02ed317
Author: Marc Véron <veron at veron.ch>
Date: Fri Nov 20 22:58:40 2015 +0100
Bug 15231 - Import patrons: Remove string splitting by html tags to avoid weird translations
Some of the strings in Home > Tools > Import patrons contain html tags and therefore are
splitted in the translation tool. This makes it nearly impossible to create correct translations
from the partial strings.
Additinally, the notes for Extended patron attributes never displayed (due to a bug).
To test:
- Apply patch
- Enable Syspref 'ExtendedPAtronAttributes'
- Go to Home > Tools > Import patrons and verify, that the Notes at the right of the
screen make sense
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Split html tags removed, notes at right side it displayed correctly
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 5843c76546d5769493099faed2fbce39fbe3b6f3)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit d1e8b93f66b8aa800b5d552f7039effaa9dc9e53)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 99d8a586bbd93352ee5c875eecbd0beec8b7b3b3
Author: Marc Véron <veron at veron.ch>
Date: Wed Dec 2 12:39:59 2015 +0100
Bug 15300: Translatability: Replace ambiguous 'From' and 'To' in members-update.tt
This patch replaces semantically ambigous words "From" and "To" in
koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
for better translatability.
To test:
- Apply patch
- Make sure that patrons can request detail changes in OPAC
(sysprefs opacuserlogin, OPACPatronDetails)
- Log in to OPAC, request a change of personal details
(cgi-bin/koha/opac-memberentry.pl)
- Log in to staff client
- Click link 'Patrons requesting modifications' or go to
Home > Patrons > Update patron records
- Verify that table headers make sense
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Rewording Ok for translation purpose
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit b07513526965720c7d558bd9c6176088304a2ee9)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit d8aa61c574022e842a9921beaa2fe723891b895d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit a62b8a526ca282d724e44c34e47c9e63f9e385ae
Author: Marc Véron <veron at veron.ch>
Date: Sun Dec 13 22:39:53 2015 +0100
Bug 15366 - Fix breadcrumbs and html page title in guided reports
This patch fixes following issues with breadcrumbs and html page title
in Home > Reports > Guided reports wizard:
- Sometimes, breadcrumbs display a stray > at the end
- While creating a report, steps are not displayed in breadcrumbs and
do not appear in html page title
- html page title is divided by newlines
To test:
- Apply patch
- Go to Home > Reports > Guided reports wizard
- Go to all pages including the steps for creating a new report and
verify
- that the breadcrumbs display properly and make sense
- in html source, the page title makes sense and displays on one line.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as descrived
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 639ccd469f4e00e1737e0dec6ee914d845907938)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit c7028a02b5158591665a35421b4a80f54f5324f3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 26fd2156293f3b3ea9d460b437bcd5f08879bf54
Author: Marc Véron <veron at veron.ch>
Date: Sun Dec 13 20:34:46 2015 +0100
Bug 15365: Translatability: Fix issue on Administration > Circulation and fine rules
Fix translatability issue on smart-rules.tt to prevent odd translations (Sentences
splitted by tags and newlines).
To test:
- Apply patch
- Go to Administration > Circulation and fine rules
- Verify that the lines "Note: " and "Important: " below "Default holds policy by
item type" make sense and are not splitted by tags and (in html) by newlines.
(Amended to fix commit message)
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
strong Note and Important displayed Ok for translation purpose
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit bc2e4ba86208e26d9890868d6deb5c65c263e907)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 0eff941b1b28ae1db1a2e11345a6d7cfb9616c3f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 519dd299436097e44278f392238663f15b90146a
Author: Marc Véron <veron at veron.ch>
Date: Sun Dec 13 11:58:52 2015 +0100
Bug 15363: Translatability: Fix issue with ambiguous 'all' on Administration > Set library checkin and transfer policy
In branch_transfer_limits.tt, set ambiguous word 'all' (separated by tags) into a
translatable context.
To test:
Apply patch
- Go to Home > Administration > Set library checkin and transfer policy
- Verify that the word 'all' is no longer separated by tags
in "For all collection codes: " rsp. "For all item types: "
(Switch with syspref 'BranchTransfersLimitsType')
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works well for translation purpose
Bug 15363: (followup) Move tags inside if statements
Followup for comment #3
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 27363271be4b4cc308572dcf04049edf33fa1a7c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 88d1dfcfffcb66ffde3b4ecdebc9b9e5876bc076)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 8c404db64ed99c99596d55440637d94166806a20
Author: Marc Véron <veron at veron.ch>
Date: Sun Dec 13 10:47:53 2015 +0100
Bug 15362: Translatability: Fix issue on Administration 'Did you mean?'
Fix sentence splitting by tags on didyoumean.tt leading to odd translations.
To test:
- Apply patch
- Go to Home > Administration > Did you mean?
- Verify that the information below the title displays properly and makes sense.
- Disable Javascript, reload page
- Verify that the warning about missing Javascript displays properly and makes sense.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as descrived. Removed em tags for translation purpose
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 984f641417e20ab561b2670b5ed921dc4aa6a907)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 40724deeb8ebd36e9be5253f47d16396230191e4)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 98937fa5bcd209bf8f8f642fe031edd03de23d73
Author: Marc Véron <veron at veron.ch>
Date: Wed Dec 9 21:31:29 2015 +0100
Bug 15346: Translatability: fix sentence splitting issue in memberentrygen.tt
Fix sentences in memberentrygen.tt that are split by <strong> tags, leading to
wrong capitalization in German (because it can not be decided if a string is part
of a sentence or a standalone sentence).
Example: Es sind Keine Bibliotheken definiert.
To test:
- Apply patch
- To trigger the messages, you have to edit a patron in a system where
no libraries and no patron categories are defined
- Alternatively, carefully review the changes in
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Sentences fixed for translation purposes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 698fb010f55c0d68789299003f4ac55326142f72)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit ec2e2f6d0b9d4b376b59d24e7895ad767d8fff97)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 4448c38763c94415c64f51b2de6cda90a88fc6c0
Author: Marc Véron <veron at veron.ch>
Date: Wed Dec 9 18:36:21 2015 +0100
Bug 15345: Translatability: fix issue in facets (Availability')
This patch fixes an issue with a splitted sentence in facets (Avalability)
that leads to weird translations e.g.:
German: 'Zeige nur Verfügbar Exemplare'
French: 'Montrer seulement disponible exemplaires'
Additionally, the link "Show all items" gets it's own li tags to display
nicely like the other links in the facets column and it removes superfluous
dots.
To test in OPAC and Staff client:
- Apply patch
- Do a search that results in more than one available items
- In column "Refine your search", click on "Limit to currently available
items"
- Verify that the message "Showing only available items" and the link
"Show all items" display nicely.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
use_zebra_facets set to 0 in koha-conf.xml to test. Works as described
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 5e80a64ea39140c9918335fc472a441bb3fa9c6a)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 3951a8fffd4d9b6ecb22a8382878c79225e6d2ca)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 10 +-
C4/Letters.pm | 8 +-
C4/Members.pm | 10 -
C4/UsageStats.pm | 2 +-
C4/Utils/DataTables/Members.pm | 30 +-
admin/aqbudgets.pl | 4 +-
admin/aqplan.pl | 6 +-
admin/transport-cost-matrix.pl | 2 +-
catalogue/detail.pl | 2 +-
catalogue/itemsearch.pl | 9 +-
catalogue/search.pl | 4 -
circ/circulation.pl | 2 +-
circ/returns.pl | 8 +-
circ/transferstoreceive.pl | 2 +-
circ/waitingreserves.pl | 2 +-
etc/zebradb/zebra-authorities-dom.cfg | 2 +-
etc/zebradb/zebra-authorities.cfg | 2 +-
etc/zebradb/zebra-biblios-dom.cfg | 2 +-
etc/zebradb/zebra-biblios.cfg | 2 +-
koha-tmpl/intranet-tmpl/prog/en/columns.def | 6 +-
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 8 +
.../prog/en/includes/catalogue/itemsearch_item.inc | 5 +-
.../prog/en/includes/cateditor-ui.inc | 1104 ++++++++++++++++++++
.../prog/en/includes/checkouts-table-footer.inc | 6 +-
.../includes/csv_headers/catalogue/itemsearch.tt | 2 +-
.../intranet-tmpl/prog/en/includes/facets.inc | 2 +-
.../en/includes/member-alt-address-style-de.inc | 2 +-
.../en/includes/member-alt-address-style-us.inc | 2 +-
.../en/includes/member-alt-contact-style-de.inc | 2 +-
.../en/includes/member-alt-contact-style-us.inc | 2 +-
.../en/includes/member-main-address-style-de.inc | 4 +-
.../en/includes/member-main-address-style-us.inc | 4 +-
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 6 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +-
.../en/modules/admin/auth_subfields_structure.tt | 4 +-
.../en/modules/admin/branch_transfer_limits.tt | 2 +-
.../prog/en/modules/admin/branches.tt | 2 +-
.../intranet-tmpl/prog/en/modules/admin/cities.tt | 6 +-
.../prog/en/modules/admin/didyoumean.tt | 6 +-
.../prog/en/modules/admin/koha2marclinks.tt | 3 +-
.../en/modules/admin/marc_subfields_structure.tt | 4 +-
.../prog/en/modules/admin/preferences/admin.pref | 5 +-
.../en/modules/admin/preferences/i18n_l10n.pref | 4 +-
.../prog/en/modules/admin/smart-rules.tt | 7 +-
.../prog/en/modules/catalogue/itemsearch.tt | 4 +-
.../cataloguing/value_builder/marc21_leader.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 5 +-
.../prog/en/modules/help/admin/smart-rules.tt | 2 +-
.../prog/en/modules/help/labels/label-manage.tt | 105 ++
.../prog/en/modules/help/tools/quotes.tt | 2 +-
.../prog/en/modules/installer/step1.tt | 2 +-
.../prog/en/modules/members/boraccount.tt | 20 +-
.../prog/en/modules/members/memberentrygen.tt | 4 +-
.../prog/en/modules/members/members-update.tt | 10 +-
.../prog/en/modules/members/moremember.tt | 4 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 10 +-
.../en/modules/members/tables/members_results.tt | 2 +-
.../prog/en/modules/patroncards/edit-batch.tt | 2 +-
.../prog/en/modules/reports/borrowers_stats.tt | 2 +-
.../en/modules/reports/guided_reports_start.tt | 57 +-
.../prog/en/modules/tools/import_borrowers.tt | 36 +-
.../prog/en/modules/tools/manage-marc-import.tt | 6 +-
.../prog/en/modules/tools/modborrowers.tt | 4 +-
.../intranet-tmpl/prog/en/modules/tools/quotes.tt | 3 +-
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +-
.../bootstrap/en/includes/opac-facets.inc | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-account.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 14 +-
.../bootstrap/en/modules/opac-downloadshelf.tt | 2 +-
.../bootstrap/en/modules/opac-memberentry.tt | 6 +-
.../bootstrap/en/modules/opac-messaging.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 6 +-
.../bootstrap/en/modules/opac-shareshelf.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +-
.../bootstrap/en/modules/opac-suggestions.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 37 +-
misc/translator/LangInstaller.pm | 4 +
offline_circ/list.pl | 2 +-
opac/opac-MARCdetail.pl | 3 +-
opac/opac-account.pl | 8 +-
opac/opac-ics.pl | 3 -
opac/opac-messaging.pl | 6 +-
opac/opac-passwd.pl | 3 +-
opac/opac-privacy.pl | 3 +-
opac/opac-user.pl | 6 +-
reports/borrowers_stats.pl | 2 +-
reports/guided_reports.pl | 2 +-
t/DataTables/Members.t | 2 +-
t/db_dependent/Letters.t | 12 +-
t/db_dependent/Utils/Datatables_Members.t | 76 +-
tools/modborrowers.pl | 5 +
92 files changed, 1551 insertions(+), 258 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-manage.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list