[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.00-22-gad20eea
Git repo owner
gitmaster at git.koha-community.org
Wed Jun 3 22:51:26 CEST 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 ad20eea3d10bef81a7bfef216271a487fb871dba (commit)
via 8ba2e5b1cc6f4a7d747807504b83637a1b14d9b7 (commit)
via e61073b98536142fade406ed3d30be6db38d6863 (commit)
via 4fd21c2258aa725162b57031cd80430acbaf46d6 (commit)
via d1708202116435ccc2c7e77937f667177a015121 (commit)
via 983312a96fbd51fa30280821b31e6cc833a4de77 (commit)
via d9621c58831994016f8638cd84cc840ac3fb0b5c (commit)
via 0f0fc26c609d98a550f49c5828b781345edaeadf (commit)
from 2796499f6c2b5ee41425cdf6a08723e6ace96d37 (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 ad20eea3d10bef81a7bfef216271a487fb871dba
Author: Zeno Tajoli <z.tajoli at cineca.it>
Date: Wed Apr 22 17:03:38 2015 +0200
Bug 14047: Order z39.50 biblioservers in cataloguing
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Bug 14047: Sort z39.50 servers in Acquisition
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Bug 14047: [QA Follow-up] Move result_class back into attributes
No need to put this into a separate call.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Note that we strictly speaking do not need the hashref inflator here,
because TT understands hash.column as well as object.property.
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit c7a67ea4f33402a1f3165864952d6a692f898953)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 8ba2e5b1cc6f4a7d747807504b83637a1b14d9b7
Author: Marc Véron <veron at veron.ch>
Date: Sun Apr 26 21:36:25 2015 +0200
Bug 11929: patron modification error shows borrowernumber
If an error occurs in patron batch modification, a message similar to the following is displayed:
Can not update patron with borrowernumber 7055
It would be useful to have the cardnumber as well.
This patch adds the card number to the lists of errors.
It is not easy to trigger an error (see comments).
For testing, I tweaked the sub ModMember in C4/Members.pm to always return false.
TEST PLAN
---------
1) Log in as a superlibrarian and create a test user
2) Change the cardnumber to a number differing from the
borrower number.
3) Home -> Tools -> Batch patron modification
4) Type in the cardnumber of that test user
5) Check the Library checkbox.
6) Click Save
-- nice error, but it is borrower number instead of
the card number which was entered.
7) Apply the patch
8) Repeat steps 3-6
-- nice error, but it is now more informative.
9) run koha qa test tools.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 3b3f82de377c87f9108bf07dd0d293182e5b9bdc)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit e61073b98536142fade406ed3d30be6db38d6863
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Tue May 26 14:45:22 2015 -0300
Bug 14279: Remove CGI::scrolling_list from issues_avg_stats.pl
This patch removes scrolling_lists from this file
To test
1) Go to Reports > Average loan time
2) Check dropdowns Patron category, Item type, Sort1/2 and Into application
will be changed
3) Apply the patch
4) Reload and check for regression
Followed test plan. Works as expected.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 154eb5f6f55c60632811bcae240cc8254fab7efb)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 4fd21c2258aa725162b57031cd80430acbaf46d6
Author: David Cook <dcook at prosentient.com.au>
Date: Mon May 25 14:01:09 2015 +1000
Bug 14265 - Use $.trim instead of trim() in admin/categorie.tt
This patch replaces trim() with $.trim() in admin/categorie.tt, as
$.trim() is more cross-platform (ie it is supported in "< IE9").
_TEST PLAN_
Before applying patch:
0) Use IE 8 or use Document Mode 8 in a newer IE using F12 Developer Tools
1) Go to Administration > Patron categories
2) Click "Edit" next to a category
3) Click "Save" at the bottom
4) Note the form doesn't submit (you can also notice the error in the
console log)
Apply the patch:
5) Hold down shift + refresh the page
6) Click "Save" at the bottom"
7) Note that the form does submit and there are no errors reported
Signed-off-by: Indranil Das Gupta <indradg at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
No regression found using iceweasel.
I did not know the staff interface was IE compatible.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 06ef68046e52a56f690e656f30592ff46b21a383)
commit d1708202116435ccc2c7e77937f667177a015121
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Tue May 26 13:05:51 2015 +0200
Bug 14266: Trim the email address in the pl script
The original concern of bug 14266 was to provide a compatibility for
<IE9.
But actually we don't need to trim the email address template side.
It will even better to trim it in the perl script, so that the email
will be trimed even if JS is disabled.
Test plan:
1/ Share a list and does not provide any email address
2/ Submit
=> The form is not submited, no alert/message is displayed (same as
before this patch).
3/ Share a list and provide an email address with spaces before and
after
4/ Submit
=> You should receive the email
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Test output compliant with expected test plan outcome.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit c7a8e4dd25768870de74a5a96c63a92ff1c7fcc8)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 983312a96fbd51fa30280821b31e6cc833a4de77
Author: David Cook <dcook at prosentient.com.au>
Date: Mon May 25 14:07:27 2015 +1000
Bug 14266: Replace trim() with $.trim() in opac-shareshelf.tt
This patch replaces trim() with $.trim() which is supported
in versions of IE older than IE9.
Revised test plan
=================
Before applying patch:
0) Use IE 8 or Document Mode 8 in a newer IE using F12 Developer Tools
1) Set OpacAllowSharingPrivateLists to "Allow" in Global System Preferences
2) Create a private list in the OPAC
3) Add a record to the private list
4) Click "Share" or "Share list" on one of the list screens
5) Type in an email address and click "Send"
6) Note the error in the console log
7) The page should submit
Apply the patch:
7) Hold shift + refresh the browser to update any Javascript cache
8) Try to "Share" the list again
9) Note that the form submit after clicking "Send" and
that there are no errors in the console log
http://bugs.koha-community.org/show_bug.cgi?id=14266
Signed-off-by: Indranil Das Gupta <indradg at gmail.com>
Remarks: Works as per revised test plan
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit e1ac8b431002ad15ba8bc19a61f2daf0424552e2)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit d9621c58831994016f8638cd84cc840ac3fb0b5c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed May 20 11:31:18 2015 -0400
Bug 12066: New renew page in staff client doesn't record branch in statistics
Test Plan:
1) Apply this patch
2) Renew an item via circ/renew.pl
3) Note the branch code of your logged in library is set as the
branch in the generated statistic line
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested pre and post patch, now branch is saved
No errors
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 d78f832cb026ace04ff3e6d2c3765b39656e0e11)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 0f0fc26c609d98a550f49c5828b781345edaeadf
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon May 25 11:22:07 2015 +0200
Bug 13946: Change order status 'Pending' to 'Ordered'
The order status after closing the basket is 'ordered' in the
database, but displays as 'pending' in the staff interface.
As we use 'pending' when you have to review a suggestion, this
clashes in translations and the meaning is different. The patch
renames 'pending' for the order status to 'Ordered' to be more
clear.
To test:
- Verfiy 'Ordered' shows in the pull down on the acq advanced
search and search still works correctly
- Verify the results table also display 'Ordered' as the status
Signed-off-by: Cédric Vita <cedric.vita at dracenie.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 480ac8667971a638b4b27d0dc8e5bb29f9f2a372)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
-----------------------------------------------------------------------
Summary of changes:
acqui/z3950_search.pl | 4 +-
cataloguing/z3950_search.pl | 4 +-
circ/renew.pl | 3 +-
.../prog/en/modules/acqui/histsearch.tt | 6 +-
.../prog/en/modules/admin/categorie.tt | 2 +-
.../prog/en/modules/reports/issues_avg_stats.tt | 55 ++++++++++---
.../prog/en/modules/tools/modborrowers.tt | 7 +-
.../bootstrap/en/modules/opac-shareshelf.tt | 17 +++-
opac/opac-shareshelf.pl | 6 ++
reports/issues_avg_stats.pl | 84 +++++++-------------
tools/modborrowers.pl | 6 +-
11 files changed, 116 insertions(+), 78 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list