[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.00-58-g175cc45
Git repo owner
gitmaster at git.koha-community.org
Thu Jun 11 22:51:59 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 175cc45fcb26dba704d20ad1ac5b82c65cd2046e (commit)
via 82a72506809b712e88146eb4926781c5247a9091 (commit)
via 7c325f095f0b75b84d6aac002b5df4800f36605f (commit)
via fc3fe18d05f2d12e1bfb33b279112680b6fd16a9 (commit)
via cab96a3c8c4cf1827bf3350107e82da75b8b8856 (commit)
via ff0281d40ad9bcff563a595082b051dd4304ffc2 (commit)
via 98956a99c05160d215bf637516c0091c39a1040c (commit)
from 1ae372980b11381bae8c32d3f8afd2e9382d50d9 (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 175cc45fcb26dba704d20ad1ac5b82c65cd2046e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 8 15:24:50 2015 +0200
Bug 13970: Remove category_type related code
Working on bug 13497 and bug 9314, I run into some Koha vestiges.
The category_type parameter should not be passed to memberentry.
On creating a new patron, the categorycode should be passed, and on
editing, it's useless. We can work with the borrowernumber and retrieve
these values.
Details of the changes:
- members-toolbar.inc: Remove the category_type parameter passed to
memberentry.pl
- memberentrygen.tt: Just remove the useless category_type parameter on
editing a patron. Also remove the unused one passed to
guarantor_search.pl.
- tables/members_results.tt: the borrowernumber is enough to edit a
patron.
- memberentry.pl: check_categorytype is never used in the template, all
the process to calculate/retrieve it is unnecessary.
- members/nl-search.tt: The borrowernumber is enough to edit a patron.
Test plan:
Try to create and edit patrons and verify that
- the guarantor search still work
- the form (memberentry) behave as before
Edit a patron from the nl-search.pl script (Magnus?)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
On top of 9314 (13497 already pushed)
No evident regressions found, add/edit patron works,
search/set guarantor works.
Cant test nl-patron.pl save for exec it.
prove -v t/NorwegianPatronDB.t runs
No koha-qa 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 c34569480884a543d19f3e87d13153cc771fa135)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 82a72506809b712e88146eb4926781c5247a9091
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 8 13:29:28 2015 +0200
Bug 9314: Remove useless code related to the type_only parameter
Since the pref AddPatronLists has been removed in bug 13497, the code
related to type_only and category_type in memberentry.pl is useless.
Test plan:
Confirm you don't the information message.
You can also confirm that the message was wrong and nothing was saved.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Dead code removed, no errors
Think that bug description can be updated to commit message
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 9d793b2f7e229251887e96c13c1ad6cb9410de38)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 7c325f095f0b75b84d6aac002b5df4800f36605f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jun 5 08:06:29 2015 -0400
Bug 14338: Unable to delete patron images
The call to RmPatronImage is still passing cardnumber as its parameter
instead of borrowernumber.
Test Plan:
1) Upload a patron image
2) Ensure the card number is not the same as the borrower number
3) Attempt to delete patron image
-- Image will remain
4) Apply this patch
5) Attempt to delete patron image
-- Image will be removed
6) run koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
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 721a77e6696c26efedd1955569a00e1dff2aa6b8)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit fc3fe18d05f2d12e1bfb33b279112680b6fd16a9
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Fri May 22 13:11:19 2015 +0200
Bug 13265: Use sessionStorage to store searches instead of cookies
This is a counter patch.
The idea is to provide a permanent solution for the cookie length issue
we occurred on storing the searches (intranet side).
Test plan:
Launch as many searches as you can (don't forget to sleep).
You should not get any error.
Confirm there is no regression using the results browser.
Tested with 6 parralel searches in different tabs (with alternatively browising up and down). No problems found.
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 41b9687d975a3c2a54cc28229d4ba76edf175de9)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit cab96a3c8c4cf1827bf3350107e82da75b8b8856
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue Jun 9 02:02:55 2015 +0000
Bug 14360: Unescaped variable causes alert pop-up
To test:
1) Create a list in the OPAC, name it: <script>alert('Hello');</script>
2) Delete the list
3) Confirm deletion
4) See the alert say 'Hello'
5) Apply patch
6) Recreate list with same name
7) Delete list
8) Confirm deletion and alert no longer pops up
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 9bef8f8738492564af7da78cba841366c70ada3c)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit ff0281d40ad9bcff563a595082b051dd4304ffc2
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Mon Jun 8 02:30:23 2015 +0000
Bug 14360: Unescaped variable causes alert
Adding |html to [% resultsperpage %] to escape the variable and get rid of the alert.
To test:
1) Go to URL such as ... /cgi-bin/koha/opac-authorities-home.pl?op=do_search&resultsperpage=1%22%3E%3Cscript%3Ealert%28document.cookie%29%3C/script%3E
2) Notice pop-up box with alert
3) Apply patch, refresh page
4) Notice alert is gone
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 9e920f7479df6d36db3e3450d6e6c2524fa9fe56)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 98956a99c05160d215bf637516c0091c39a1040c
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Apr 15 01:02:08 2015 -0400
Bug 10625: Inventory/Stocktaking tool cannot handle windows file uploads
The current code uses
$barcode = <fh>;
logic. This reads until \n, as far as I can tell.
EOL is indicated by \n, \r, and \r\n depending on OS and software.
So, to this end, rather than File::Slurp (which is a potential
memory hog, which is already an issue with no filters), a loop
to pre-read the barcodes was written.
This loop includes:
$barcode =~ s/\r/\n/g;
$barcode =~ s/\n\n/\n/g;
my @data = split(/\n/, $barcode);
push @uploadedbarcodes, at data;
So, that means that lines ending in \n would have it stripped
and pushed into the uploaded barcodes array.
Lines ending in \r would likely be read as one giant block,
have everything converted to single \n's and then using a split,
the set of barcodes are pushed into the uploaded barcodes array.
Lines ending in \r\n would get that stripped and pushed into the
uploaded barcodes array.
It is then the uploaded barcodes array that is looped over for
validating the barcodes.
TEST PLAN
---------
1) Back up your database
2) Download the three sample files (or create your own)
3) Log in to staff client
4) Create a branch with no inventory.
5) Home -> Tools -> Inventory/Stocktaking
6) Browse for your '\r' test file.
7) Limit to just that branch
8) Click 'Submit'
-- Confirm expected errors
9) Repeat steps 5-8 with the '\n' test file.
10) Repeat steps 5-8 with the '\r\n' test file.
-- one of these repetitions should have problems.
11) Apply patch
12) Repeat steps 5-8 for each of the 3 test files.
-- there should be no issues.
13) run koha qa test tools.
Note: This is a tweak based on Jonathan Druart's comment #16
I have reset it to needs sign off again.
Followed test plan. Works as expected. qa OK.
Signed-off-by: Marc Véron <veron at veron.ch>
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 d75a751d49ad65b007572e02320735d2b02c9e1f)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
koha-tmpl/intranet-tmpl/js/browser.js | 80 ++++++++++----------
.../prog/en/includes/members-toolbar.inc | 22 ++----
.../prog/en/modules/members/memberentrygen.tt | 13 ++--
.../prog/en/modules/members/moremember.tt | 2 +-
.../prog/en/modules/members/nl-search.tt | 8 +-
.../en/modules/members/tables/members_results.tt | 2 +-
.../en/modules/opac-authoritiessearchresultlist.tt | 6 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 +-
members/memberentry.pl | 15 +---
tools/inventory.pl | 10 ++-
tools/picture-upload.pl | 4 +-
11 files changed, 74 insertions(+), 92 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list