[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.07-51-g4ff3b86
Git repo owner
gitmaster at git.koha-community.org
Tue Jun 23 00:29:12 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.18.x has been updated
via 4ff3b86e932e24a4d404f095578bc01f6afd9c6b (commit)
via f462209e86e30e8ea23da67fb367c77c6d33be88 (commit)
via 5b03b9716b762a1930aa5d298a163fef7fb76992 (commit)
via 358e8e889d8a02d55210d353cd01bbf35d1ddc15 (commit)
via 611df7517a2f1fa58c6780463ff56253d908a23d (commit)
via 0cba81194f86b1b7fbea9d2ab48fe8c995a3c247 (commit)
via a1e0768ceb728f0019086050837884d29e498dfe (commit)
via 8ba165b069f9d921c103214b2803a6b9ff8b2f3b (commit)
via 6c76df3ad5abf7679ec22d006133398b9816663a (commit)
via 4bd9dbdb0cd32bb2f8892a5759d2f26923917665 (commit)
via bd375631fcc0495661260df21bd32085a7bd387e (commit)
via 503d90394ded34bab4671fa22e4c46291314ec84 (commit)
via 971f6ccf917e57a9cb6de22d3d0092a017abef74 (commit)
via 2a7b383c11398f9f49e0433222789a13aaa58ef0 (commit)
via 20213b7d5c2d4a13e01c27969fc184e0c21ec3ae (commit)
via 817e8f298f60279cc5c49fc0bc3bbea39f882dce (commit)
via f62e95456b4e4177bcefe11312aea088a78efdab (commit)
via c8a83c0804b36bf3e814b8483c013bc716d1d806 (commit)
via dd6bb8fb380721323bc2f3b331430c7315f19b6d (commit)
via 0c26902f230ea3638a29f653db5b84cdf3b81197 (commit)
via 5d0e666e3655e739712b98f5073425b44ff761b2 (commit)
via b2a8948b989ddbdb1a4f80122eee3d499abfa6ad (commit)
via 6be5837e06bf8157b236e9bc48889bfd7ae90293 (commit)
via 58313590f239062a1fe2d6a3778c298182c2fc32 (commit)
via ef7de413c8571d8429994f7855550fedb97e39e2 (commit)
via af127c124f1575a96cc3efca7eff0ef9135e88e6 (commit)
via 433f4628b232058e90207b7b1c32c316b11450b1 (commit)
via 7824fde152ca88c56af13564b065c06a3e2cb782 (commit)
via 0e7d7284008c216b19a16bb39a8555636caad993 (commit)
via bdd863335c4a698adbcbe44c9dcefb00658c04db (commit)
via 55a57caf6c505550407bc076122932b7528279ed (commit)
via 88332533798c924db5a3b1dcaf298bb1ef040569 (commit)
via f703f2d3685666ae11890128d7bb80e186cb9384 (commit)
via 6de54db7eefe7033b34e5d7e63473fef80e4f232 (commit)
via 2c0237d3118fdd92a02dbc48a199758a3ac66b57 (commit)
via 53318a5ea51fa24c062b82ba5caeb491dbb17e73 (commit)
via 3dbf30c17de4f0c98f6d6e7b18c2d8c1ffed4269 (commit)
via d023a70270574384b6178c18ac6344aeb9691d71 (commit)
via 5b84b22cd82cc2022fbdfba442a9e0ffc3bdfc1f (commit)
via f911c57996b7a53b48a2c45b20f0fde9ea050371 (commit)
via 55afd5f0090ebb40f37316c71d30779de839b1a7 (commit)
via c4932c301cc0b54b603746da57983ca94629af3c (commit)
via c9a0fbe7c6f13ca17dbac3e96647195a17c7af6a (commit)
via 6ce56d5589def9ae3613cf5b03db5c4b09296b05 (commit)
via 9292bebbdd041788acdecda3cf3265169e8e231d (commit)
via 5e48a461dbcd102ebc76c7552ed5b695861d97f7 (commit)
via 2d2de7b2b3c69732617d1c8bc9f09d81ceedab13 (commit)
via 1d9774a94d2682c3b6899e3a4c79a4f9d1afa1d1 (commit)
via bb2eccde4dd3b8d9b9b9b72f6cc6651827f85561 (commit)
via cedefdc86b7b1243d91d9059504a12f7aa0cec6f (commit)
via 5bb8c8afd78dbf4e207607895ccc394c43e6821c (commit)
from f89ec8c210e95ec1f02262e0ae025b230e06904f (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 4ff3b86e932e24a4d404f095578bc01f6afd9c6b
Author: Chris <chris at bigballofwax.co.nz>
Date: Mon Jun 22 05:23:52 2015 +0000
Bug 14408 Path Traversal error
Counter counter patch
Please test well, including with the null byte %00, this uses a whitelisting to only allow files ending with .tt
and not allowing ../etc
Note the previous patch tries to protect against /etc/passwd
but //etc/passwd is now vulnerable. I do think a whitelist is safer than trying to do a blacklist
/cgi-bin/koha/svc/virtualshelves/search
/cgi-bin/koha/svc/members/search
Are vulnerable
To test:
1/ Hit /cgi-bin/koha/svc/members/search?template_path=members/tables/members_results.tt
Notice you get a valid JSON response
2/ Hit
/search?template_path=..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2fetc%2fpasswd
(You may have add more ..%2f or remove them to get the correct path)
Notice you can see the contents of the /etc/passwd file
3/ Hit
/cgi-bin/koha/svc/members/search?template_path=test%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2fetc%2fpasswd
4/ Apply patch
5/ Hit the first url again, notice it still works
6/ Hit the second url notice it now errors with a file not found
7/ Hit the third url notice it now errors with a file not found
Repeat for the other script also
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f462209e86e30e8ea23da67fb367c77c6d33be88
Author: Liz Rea <wizzyrea at gmail.com>
Date: Tue Jun 23 09:57:18 2015 +1200
Revert "Bug 14408 Path traversal vulnerability"
This reverts commit a1e0768ceb728f0019086050837884d29e498dfe.
commit 5b03b9716b762a1930aa5d298a163fef7fb76992
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Jun 19 11:41:45 2015 +1200
Bug 14418 : More XSS vulnerabilities in opac-shelves.pl
To test:
1/ Hit a url like
/cgi-bin/koha/opac-shelves.pl?viewshelf=7&op=modif&display="><script>alert('oh
noes')</script> Where the id is a valid shelf id
2/ Notice the js is executed
3/ Apply patch
4/ Reload page
5/ Notice input is now escaped on display
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Tested in Debian, couldn't reproduce the alert in Iceweasel, but in
Chromium. Patch fixes it.
commit 358e8e889d8a02d55210d353cd01bbf35d1ddc15
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Jun 19 11:30:22 2015 +1200
Bug 14418 : XSS flaw in opac-shelves.pl
To test:
1/ Create a list and add at least one item to it
2/ Hit a url like http://192.168.2.18/cgi-bin/koha/opac-shelves.pl?viewshelf=7&sort=author&direction=%22%3E%3Cscript%3Ealert%28%27oh%20noes%27%29%3C/script%3E
Where the shelf id is the number of the list you created, notice the js is executed
3/ Apply the patch
4/ Reload the page notice the js is now escaped
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
commit 611df7517a2f1fa58c6780463ff56253d908a23d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Jun 19 09:25:22 2015 +1200
Bug 14418 XSS Vulnerabilities
Fix for /cgi-bin/koha/opac-search.pl
To test
1/ Hit /cgi-bin/koha/opac-search.pl?tag="><script
src='http://cst.sba-research.org/x.js'/>&q=a
2/ Notice the js is executed
3/ Apply patch
4/ Reload page, notice it is no longer executed
5/ Test the rss links work still
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Confirmed bug and that the patch fixes it.
commit 0cba81194f86b1b7fbea9d2ab48fe8c995a3c247
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Jun 19 08:35:07 2015 +1200
Bug 14412 : SQL injection possible
There is a SQL Injection vulnerability in the
/cgi-bin/koha/opac-tags_subject.pl script.
By manipulating the variable 'number', the database can be accessed
via time-based blind injections.
The following string serves as an example:
/cgi-bin/koha/opac-tags_subject.pl?number=1+PROCEDURE+ANALYSE+(EXTRACTVALUE(9743,CONCAT(0x5c,(BENCHMARK(5000000,MD5('evil'))))),1)
To exploit the vulnerability, no authentication is needed
To test
1/ Turn on mysql query logging
2/ Hit /cgi-bin/koha/opac-tags_subject.pl?number=1+PROCEDURE+ANALYSE+(EXTRACTVALUE(9743,CONCAT(0x5c,(BENCHMARK(5000000,MD5('evil'))))),1)
3/ Check the logs notice something like
SELECT entry,weight FROM tags ORDER BY weight DESC LIMIT 1
PROCEDURE ANALYSE
(EXTRACTVALUE(9743,CONCAT(0x5c,(BENCHMARK(5000000,MD5('evil'))))),1)
4/ Apply patch
5/ Hit the url again
6/ Notice the log now only has
SELECT entry,weight FROM tags ORDER BY weight DESC LIMIT 1
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Confirmed the problem and the fix for it.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit a1e0768ceb728f0019086050837884d29e498dfe
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Fri Jun 19 10:12:45 2015 +0200
Bug 14408 Path traversal vulnerability
/cgi-bin/koha/svc/virtualshelves/search
/cgi-bin/koha/svc/members/search
Are vulnerable
To test:
1/ Hit /cgi-bin/koha/svc/members/search?template_path=members/tables/members_results.tt
Notice you get a valid JSON response
2/ Hit
/search?template_path=..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2fetc%2fpasswd
(You may have add more ..%2f or remove them to get the correct path)
Notice you can see the contents of the /etc/passwd file
3/ Hit
/cgi-bin/koha/svc/members/search?template_path=test%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2f..%2fetc%2fpasswd
4/ Apply patch
5/ Hit the first url again, notice it still works
6/ Hit the second url notice it now errors with a file not found
7/ Hit the third url notice it now errors with a file not found
Repeat for the other script also
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 8ba165b069f9d921c103214b2803a6b9ff8b2f3b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Jun 6 14:34:57 2015 +0200
Bug 14350: Missing statement in kohastructure.sql - DROP TABLE IF EXISTS borrower_sync
Reported by Jonathan on bug 11401:
DROP TABLE IF EXISTS borrower_sync;
is missing in installer/data/mysql/kohastructure.sql
To test:
- Run the web installer and confirm all tables are
created correctly
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 2fe241cc0f774799b8dca329d41d03f2217ffcaa)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 6c76df3ad5abf7679ec22d006133398b9816663a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Apr 28 11:26:44 2015 +0200
Bug 11941: Add link to patron lists from the patron home page
The patron lists are only accessible from the tools module, which is not
easily accessible when you are in the patron module.
Test plan:
Go on the patron home page.
In the toolbar, you should see a link to the patron lists.
NOTE: Tweaked button to a to get the click to work.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 27ef1410a7784577149bed6a466937c7ded6ba70)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 4bd9dbdb0cd32bb2f8892a5759d2f26923917665
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Mon May 25 05:25:04 2015 +0530
Bug 14206: Adds test for getletter() call from overdue_notices.pl
Adds missing test for getletter() when called from overdue_notices.pl
Test plan
=========
1/ apply this patch
2/ run prove -v t/db_dependent/Letters.t
all tests should pass, especially test #40 which tests call from
overdue_notices.pl
Signed-off-by: Marc Véron <veron at veron.ch>
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 c07f83f643e6b8820d90487a23e91e9b062a5cd6)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit bd375631fcc0495661260df21bd32085a7bd387e
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Fri May 22 03:49:10 2015 +0530
Bug 14206: Adds delete function for non email templates
C4::Letters::getletter() is called in tools/letter.pl by the function
delete_confirm() to display the selected notice for deletion. Due to
current implementation of getletter(), a notice that does not use
the 'email' template (but uses any/all of the other templates - sms,
print or phone) can't be deleted from the staff client.
This patch adds deletion capability for notices that do not use email
template, but uses any/all of the other templates i.e. sms, print or
phone. This also adds 2 tests to t/db_dependent/Letters.t for testing
both conditions - a) when message_transport_type is specified b) when
it is not.
Test plan
=========
1/ Go to Tools -> Notices & Slips. Add a new notice only for print,
leave 'Library' and 'Koha module' options as default selections.
Enter 'KOHA_14206' and 'Koha Test 14206' against Code and Name
respectively, and 'Test' and 'Test Message' for subject and body.
Leave the Email, Phone and SMS tabs blank. Save the notice.
2/ On the notices listing page the new notice will be listed. Try to
delete it. It will load the 'Delete notice' dialog form, but the
table will not show any data under <th>s - 'Library', 'Module',
'Code' or 'Name'.
3/ Click the "Yes, delete" button. The page will be submitted and the
Notices listing reloaded. The print-only KOHA_14206 notice should
continue to exist. This is *wrong*.
4/ Apply this patch
5/ Reload the listings page and click on the 'Delete' link for Notice
KOHA_14206. This time, it should show the data under 'Module',
'Code' or 'Name' at least.
6/ Click on 'Yes, delete'. The page should submit and the listing page
reload. This time KOHA_14206 will be gone.
7/ Run prove -v t/db_dependent/Letters.t
All tests should PASS without any error.
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
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 8895caa33985bbb0cad9b011c4706d4591d2869b)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 503d90394ded34bab4671fa22e4c46291314ec84
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 971f6ccf917e57a9cb6de22d3d0092a017abef74
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 2a7b383c11398f9f49e0433222789a13aaa58ef0
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 20213b7d5c2d4a13e01c27969fc184e0c21ec3ae
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 817e8f298f60279cc5c49fc0bc3bbea39f882dce
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit f62e95456b4e4177bcefe11312aea088a78efdab
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Apr 16 16:39:09 2015 +0200
Bug 10355: paramater 'object' lost on the road
Test plan:
1) Go to any detail page in staff
2) Click on the modification log tab
3) Verify, that the object is prefilled with the records biblionumber
and you can also see it as parameter in the url
4) Click a second time on modification log to reset your search
Before this patch, the object parameter was empty.
It now contains the value of the biblionumber.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Work as described, no koha-qa errors
http://bugs.koha-community.org/show_bug.cgi?id=10335
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 0002126a2ab0ac38a8d3f144f446dc3ba69dab59)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Conflicts:
tools/viewlog.pl
commit c8a83c0804b36bf3e814b8483c013bc716d1d806
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Fri Jun 5 12:01:28 2015 -0300
Bug 14344: uninitialized value warning C4/Utils/DataTables/Members.pm
The condition for the assignment depends on $searchtype to be defined
and equal to 'contains'. So this change doesn't change the semantics.
- if $term !~ /^%/
- and $searchtype eq "contain";
+ if (defined $searchtype) && $searchtype eq "contain"
+ && $term !~ /^%/;
To test:
- Home -> Circulation -> Checkout
- Search for a user that does not exist (I searched 'whywouldthisexist') on the intranet interface.
- Look at the intranet logs
=> FAIL: you get "Use of uninitialized value $searchtype in string eq at.,,"
- Apply the patch
- Repeat the search
=> SUCCESS: No warning
- Sign off :-D
NOTE: Other pages are more forgiving. Tweaked test plan.
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 d82aeb352f35ec37fdd62fed7e9a713168a21c28)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit dd6bb8fb380721323bc2f3b331430c7315f19b6d
Author: Marc Véron <veron at veron.ch>
Date: Tue Jun 2 11:39:17 2015 +0200
Bug 14314: System Preferences: Better explanation for syspref 'ShowReviewerPhoto'
[PASSED QA] If syspref ShowReviewerPhoto is enabled, the reviewer's avatar is displayed beside comments in OPAC. The avatar will be searched on www.libravatar.org using the patron's email address.
This patch changes the text for 'ShowReviewerPhoto'.
To test:
Apply patch
Go to Home > Administration > System preferences
Search for ShowReviewerPhoto
Verify that the new explanation makes sense.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Better explanation, no errors.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Changed mail to e-mail.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit d763d7cf3c28149b5d7f82de8a98789ee97814d6)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 0c26902f230ea3638a29f653db5b84cdf3b81197
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 4 12:47:13 2015 +0200
Bug 14330: Remove unused email_sender from sendbasket/sendshelf
The sendbasket/sendshelf scripts and templates do not use email_sender
as a cgi parameter or as a template var. Probably a leftover from previous
changes.
Let's make Koha cleaner :)
Test plan:
[1] Send your cart from opac or staff.
[2] Send a shelf from opac or staff.
[3] Git grep email_sender. No results.
Followed test plan. 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: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 0114465ced0d87aed51e8632e0ec1c005ae4fce3)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 5d0e666e3655e739712b98f5073425b44ff761b2
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Apr 24 17:03:09 2015 +0200
Bug 11790: Remove dependency C4::Context from C4::Charset
C4::Context is only used to retrieve a syspref value.
This patch moves the use of C4::Context to a require.
Test plan:
Try to reach the SetMarcUnicodeFlag subroutine (batchmod, add/update a biblio, etc.)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested on French UNIMARC install
No errors adding/editing biblios
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 34fe5c24167f6bc27cff519d4a26c347d06341b3)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit b2a8948b989ddbdb1a4f80122eee3d499abfa6ad
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 4 12:03:42 2015 +0200
Bug 14329: Useless copy/pasta from Template::Plugin::HtmlToText
The synopsis of this TT plugin contains two example lines:
[% myhtml FILTER html2text(leftmargin => 0, rightmargin => 0) %]
[% myhtmltext | html2text %]
These lines have been copied (without too much thought :) to a few templates. Since we do no use the variables myhtml or myhtmltext in these templates, these lines are useless.
Test plan:
[1] Put some items in your cart. And send it.
[2] Send a shelf.
[3] Git grep on myhtml. Should not have results.
NOTE: Sent carts and lists in Intranet and OPAC successfully.
Though, this does bring into question why the letters
have HTML formatting if it is getting removed. That,
however, is beyond the scope of this bug.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 4fd923e12eea70b7e871f0068471ff5ef91dda01)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 6be5837e06bf8157b236e9bc48889bfd7ae90293
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 4 09:15:24 2015 +0200
Bug 14327: Fix js error "TypeError: events is null" in additem.js
If you have no item plugins, the events variable in BindPluginEvents
of additem.js will be null. So testing events.length will generate
the described error.
This patch adds a check to prevent that from happening again.
Test plan:
[1] Do not yet apply this patch !
[2] Temporarily remove framework plugins from your items (in ACQ or default
framework). Probably you have to clear dateaccessioned.pl and
barcode.pl.
[3] Open js console in your browser.
[4] Go to Acquisition. Open a basket and add an order from a new empty
record.
[5] You should see js error: "TypeError: events is null" (additem.js:176)
[6] Apply this patch and reload the page (make sure that you refresh so
that the new javascript code is read).
[7] The TypeError should be gone.
[8] Restore the framework plugins from step 2. Refresh the page again and
verify that they still work as expected.
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 5132d5f991515b86a9282b214a9418b65b4c0881)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/js/additem.js
commit 58313590f239062a1fe2d6a3778c298182c2fc32
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue May 26 14:52:07 2015 +0200
Bug 14276: Keep highlight on the active item in item editor
The highlight only works on even items.
This patch should resolve it.
Test plan:
Edit biblio with multiple items.
Verify that the highlight is visible on the selected item you edit.
And that there is no highlight for a new item.
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 83c6817a86de68fb08cb73aef3b8b46d12587116)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit ef7de413c8571d8429994f7855550fedb97e39e2
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Mon Jun 1 15:34:00 2015 -0300
Bug 14173: Paging on 'recent comments' page in OPAC is not displaying correctly
This patch corrects the display of current page on
a multipage recent comments.
To test:
1) Enable OpacShowRecentComments
2) Add multiple comments to multiple records
I used a script to add multiple lines like
"insert into reviews values ($i, 51, $i, 'Comment $i', 1, '2015-06-01 00:00:00')"
to table reviews
3) On OPAC, go to 'Recent comments', verify the bug
4) Apply the patch
5) Reload and check correct display
Can't found missing space near 'by' from description.
Display is correct for me.
Followed test plan, displays as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
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 7928cdfbd405de9d4a8fffc535d3dcbd9a95226c)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit af127c124f1575a96cc3efca7eff0ef9135e88e6
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date: Tue Mar 10 13:35:03 2015 +0100
Bug 13815 - plack loose CGI qw(-utf8) flag creating incorrect utf-8 encoding everywhere
This is major problem for plack installations with utf-8 encoding.
In this case, we are overriding CGI->new to setup utf-8 flag and
get correctly decoded $cgi->params, and reset syspref cache using
C4::Context->clear_syspref_cache
Test scenario:
1. under plack try to search with utf-8 charactes
2. try to find patron with utf-8 characters
Signed-off-by: Gaetan Boisson <gaetan.boisson at biblibre.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 3cd086b6b6be08d902a479f302ccf18e55de911b)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 433f4628b232058e90207b7b1c32c316b11450b1
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri May 29 09:36:34 2015 -0400
Bug 14299: Today's checkouts not always sorting correctly
Sometimes the today's checkouts do not sort correctly. This is due to a
simple typo in the comparison line where the bad key 'timstamp' is
compared against the correct key 'timestamp'.
Test Plan:
1) Check out a decent number of items in a row ( 5+ )
2) Hopefully you will see they are sorted incorrectly
3) Apply this patch
4) Reload the page
5) Note they are now sorted correctly
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
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 8e9f89e92b48f1aac786e9b5608338a14603f52f)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 7824fde152ca88c56af13564b065c06a3e2cb782
Author: Liz Rea <wizzyrea at gmail.com>
Date: Mon Jun 8 16:19:07 2015 +1200
Updating database to version 3.18.07.001
commit 0e7d7284008c216b19a16bb39a8555636caad993
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Thu May 28 12:18:38 2015 -0300
Bug 14285: Bengali locale needs to be re-defined
This patch renames translation files for Bengali
language, from ben-* to bn-IN-*.
Also adds India as region
To test:
1) Apply the patch
2) Run updatedatabase
3) Install Bengali language
cd misc/translator
perl translate install bn-IN
enable
Check correct description
4) Create and install a fake Bengali variant
cd misc/translator
perl translate create bn-XX
perl translate install bn-XX
enable both variants
Check correct rendering of region
Results comply with expected test plan outcome. Signed off for bn-IN
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.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 e365e6e53592a4639f18173def7e74e0ad24419c)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Conflicts:
misc/translator/po/bn-IN-marc-MARC21.po
misc/translator/po/bn-IN-marc-NORMARC.po
misc/translator/po/bn-IN-marc-UNIMARC.po
misc/translator/po/bn-IN-staff-prog.po
commit bdd863335c4a698adbcbe44c9dcefb00658c04db
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 55a57caf6c505550407bc076122932b7528279ed
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 88332533798c924db5a3b1dcaf298bb1ef040569
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit f703f2d3685666ae11890128d7bb80e186cb9384
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri May 22 09:02:23 2015 -0400
Bug 14112: Silence warnings in t/Charset.t
After Jonathan said this was the wrong way to correct the issue,
www.utf8-chartable.de made it clear to me that the \c3\a9 were
missing x's.
TEST PLAN
---------
1) prove t/Charset.t
-- noise
2) apply patch
3) prove t/Charset.t
-- no noise
4) koha qa test tools
Signed-off-by: Aleisha <aleishaamohia at hotmail.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 4d4582566ee7d2014f30f15db4889d4cad956316)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Conflicts:
t/Charset.t
commit 6de54db7eefe7033b34e5d7e63473fef80e4f232
Author: Liz Rea <wizzyrea at gmail.com>
Date: Mon Jun 8 12:27:28 2015 +1200
Revert "Bug 14112: Silence warnings in t/Charset.t"
This reverts commit 55afd5f0090ebb40f37316c71d30779de839b1a7.
commit 2c0237d3118fdd92a02dbc48a199758a3ac66b57
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)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 53318a5ea51fa24c062b82ba5caeb491dbb17e73
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 3dbf30c17de4f0c98f6d6e7b18c2d8c1ffed4269
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit d023a70270574384b6178c18ac6344aeb9691d71
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 5b84b22cd82cc2022fbdfba442a9e0ffc3bdfc1f
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>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit f911c57996b7a53b48a2c45b20f0fde9ea050371
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Tue May 26 11:00:02 2015 -0300
Bug 14275: Remove CGI::scrolling_list from guided_reports.pl
Remove an instance of CGI::scrolling_list from this file
To test:
1) Go to Reports, Guided report wizard, New SQL report
2) Create a report with some auth value list, e.g.
SELECT surname,firstname FROM borrowers WHERE branchcode=<<Enter patrons library|branches>>
Save
3) Clic on 'Run this report", look at the dropdown, that will be changed
4) Apply the patch
5) Reload, check dropdown and any regression
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
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 764b425c1ce0573f9b02bfa3b9b2425137630f0c)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 55afd5f0090ebb40f37316c71d30779de839b1a7
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri May 22 09:02:23 2015 -0400
Bug 14112: Silence warnings in t/Charset.t
After Jonathan said this was the wrong way to correct the issue,
www.utf8-chartable.de made it clear to me that the \c3\a9 were
missing x's.
TEST PLAN
---------
1) prove t/Charset.t
-- noise
2) apply patch
3) prove t/Charset.t
-- no noise
4) koha qa test tools
Signed-off-by: Aleisha <aleishaamohia at hotmail.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 4d4582566ee7d2014f30f15db4889d4cad956316)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Conflicts:
t/Charset.t
commit c4932c301cc0b54b603746da57983ca94629af3c
Author: Magnus Enger <magnus at enger.priv.no>
Date: Wed Apr 29 21:28:50 2015 +0200
Bug 14025: Fix 865u-links in the OPAC for NORMARC
The display of links found in 856$u for NORMARC has not been keeping up with
the one for MARC21, and several sysprefs have not been implemented. This
patch tries to fix that.
Affected sysprefs:
- OPACURLOpenInNewWindow
- URLLinkText
- OPACDisplay856uAsImage
- OPACTrackClicks
To test:
- Make sure you have a record with a URL in 856$u and marcflavor = NORMARC.
(It does not have to be a full NORMARC setup or a NORMARC record, just make
sure you are viewing the record through the NORMARC XSLT files.)
- View the record both in a result list and in detail view
- Check that the 4 involved sysprefs affect the display in the expected ways
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested on NORMARC setup and XSLTs
Works as described, each syspref works
No koha-qa errors
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Since it only affects NORMAC, I trust in Magnus :)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 9b1241ecfca68c104d9adbb5d05a7547b5761e17)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit c9a0fbe7c6f13ca17dbac3e96647195a17c7af6a
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Fri May 15 01:12:11 2015 +0530
Bug 14203: Message for non-existent lang removal
A trivial string patch to update the error message displayed to
user if koha-translate is used to attempt removal of a language
that is not installed.
Test plan
=========
1/ attempt to remove a non-existent language by
<installdir>/debian/scripts/koha-translate --remove <langcode>
2/ it should show "Error: the selected language is not already
installed."
3/ apply patch
4/ repeat step 1; it should show "Error: the selected language is
not installed."
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
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 d7dc11e61fea5dcc3f0087e46b6eee8d74c21c63)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 6ce56d5589def9ae3613cf5b03db5c4b09296b05
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue May 12 02:08:17 2015 +0000
Bug 14184: Undefined $term causes noisy warns in C4/CourseReserves.pm
This patch sets $term to be an empty string.
Test plan
=========
1/ enable 'UseCourseReserves' syspref in Circulation preferences
2/ in a terminal, run a `tail -f ` on your instance's opac-error.log
3/ go to the opac, click on 'Course reserve' tab to go to
opac-course-reserves.pl
4/ notice the warning - "opac-course-reserves.pl: Use of uninitialized
value $term" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-course-reserves.pl)
7/ page works but the warning in step #4 is no longer logged
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: Testing result match expected test plan output. The QA tests
pass with "OK" for the commit.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.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 4f994e8baf3ffd209f6a0a85993039f753ec6e32)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 9292bebbdd041788acdecda3cf3265169e8e231d
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue May 12 03:01:35 2015 +0000
Bug 14185: Undefined $limit causes warn in opac/opac-readingrecord.pl
This patch sets $limit to be an empty string.
Test plan
=========
1/ login into the opac using your user account credentials
2/ in a terminal, run a `tail -f ` on your instance's opac-error.log
3/ go back to the opac, click on 'your reading history' tab to go to
opac-readingrecord.pl
4/ notice the warning - "opac-readingrecord.pl: Use of uninitialized
value $limit" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-readingrecord.pl)
7/ page works but the warning in step #4 is no longer logged
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: Testing result match expected test plan output. The QA tests
pass with "OK" for the commit.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.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 fd14184873e707236150e368f39b19a6992760b8)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 5e48a461dbcd102ebc76c7552ed5b695861d97f7
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Thu May 14 07:23:16 2015 +0530
Bug 14186 [QA Followup]: Undefined $reservedfor causes warn in opac-reserve.pl
This is a followup for Bug 14186 that removes the extraneous tab
char on line 470, so that the patch can clear QA tools.
This patch sets $reservedfor to an empty string.
Test plan
=========
1/ in a terminal, run `tail -f ` on your instance's opac-error.log
2/ go to the opac and search from an item that exists on the Koha
instance.
3/ Select the title (if more than one title is returned) and click on
'Place hold' link to go to opac-reserve.pl
4/ notice the warning - "opac-reserve.pl: Use of uninitialized value
$reservedfor" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-reserve.pl)
7/ page works but the warning in step #4 is no longer thrown up
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: Testing result match expected test plan output. The QA tests
pass with "OK" for the commit.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.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 642e6012cd125cbc3aeaca83e1fd2430ce43fdb0)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 2d2de7b2b3c69732617d1c8bc9f09d81ceedab13
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue May 12 03:30:46 2015 +0000
Bug 14186: Undefined $reservedfor causes warn in opac-reserve.pl
This patch sets $reservedfor to an empty string.
Test plan
=========
1/ in a terminal, run `tail -f ` on your instance's opac-error.log
2/ go to the opac and search from an item that exists on the Koha
instance.
3/ Select the title (if more than one title is returned) and click on
'Place hold' link to go to opac-reserve.pl
4/ notice the warning - "opac-reserve.pl: Use of uninitialized value
$reservedfor" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-reserve.pl)
7/ page works but the warning in step #4 is no longer thrown up
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: The QA test failed - "forbidden pattern: tab char (line 470)".
Marking this as 'FAILED QA'
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 8fdd352bc9bb4d0dd84ca0df33b51558ee765ea1)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 1d9774a94d2682c3b6899e3a4c79a4f9d1afa1d1
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon May 4 22:08:04 2015 +0200
Bug 14130: Update columns.def
- Updates columns.def with new columns in items
- Adds some descriptions
- Corrects some existing column descrpitions
To test:
- Read the patch to see what has been changed
- Run the guided report builder for the 'circulation'
module
- Observe changes show up
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Changes show up, no errors
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit cc4aaf891bdda0d94157c32a99c2a2acace41498)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit bb2eccde4dd3b8d9b9b9b72f6cc6651827f85561
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri May 22 12:28:14 2015 -0300
Bug 14106: (QA followup) avoid failures if no instances created
If there are no instances already created on install/upgrade, the
koha-common.postinst script hungs in the absence of files to fix
and keeps waiting for user input.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit b46e47840a021488f31722645b8e63e454cff7db)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit cedefdc86b7b1243d91d9059504a12f7aa0cec6f
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Fri May 22 13:48:13 2015 +1200
Bug 14106: patch existing zebra configs with new modulePath
This patches the zebra configuration of existing Koha installations so
that their modulePath will work on newer Debian (and presumably Ubuntu)
releases.
Testing:
* Install a package built with this patch onto a system with instances
created by an older Koha version.
* Check that the files in /etc/koha/sites/*/zebra-*.cfg have the new
modulePath: directive rather than the old one.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 48d793a0de9229463026444b3f919af9522d2211)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 5bb8c8afd78dbf4e207607895ccc394c43e6821c
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Thu May 21 15:48:06 2015 +1200
Bug 14106: fill up the zebra config with a list of modulePaths
This adds the full list of paths that debian might use for zebra to the
search path for modules.
It also means we can say we support s390x architecture. Whatever that is.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit b119dfcc0f6a7e676685e62193da0e1c138f0831)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 3 +
C4/Charset.pm | 2 +-
C4/CourseReserves.pm | 1 +
C4/Letters.pm | 7 +-
C4/Utils/DataTables/Members.pm | 4 +-
acqui/z3950_search.pl | 4 +-
basket/sendbasket.pl | 2 -
cataloguing/z3950_search.pl | 4 +-
circ/renew.pl | 3 +-
debian/koha-common.postinst | 9 +
debian/scripts/koha-translate | 2 +-
debian/templates/zebra-authorities-dom-site.cfg.in | 2 +-
debian/templates/zebra-authorities-site.cfg.in | 2 +-
debian/templates/zebra-biblios-dom-site.cfg.in | 2 +-
debian/templates/zebra-biblios-site.cfg.in | 2 +-
installer/data/mysql/kohastructure.sql | 1 +
installer/data/mysql/mandatory/subtag_registry.sql | 10 +
installer/data/mysql/updatedatabase.pl | 20 +
koha-tmpl/intranet-tmpl/js/browser.js | 80 +-
koha-tmpl/intranet-tmpl/prog/en/columns.def | 14 +-
.../prog/en/includes/biblio-view-menu.inc | 2 +-
.../prog/en/includes/patron-toolbar.inc | 3 +
koha-tmpl/intranet-tmpl/prog/en/js/additem.js | 13 +
.../prog/en/modules/acqui/histsearch.tt | 6 +-
.../prog/en/modules/admin/categorie.tt | 2 +-
.../prog/en/modules/admin/preferences/opac.pref | 2 +-
.../prog/en/modules/basket/sendbasket.tt | 2 -
.../prog/en/modules/cataloguing/additem.tt | 11 +-
.../prog/en/modules/members/moremember.tt | 2 +-
.../en/modules/reports/guided_reports_start.tt | 8 +-
.../prog/en/modules/reports/issues_avg_stats.tt | 55 +-
.../prog/en/modules/tools/modborrowers.tt | 7 +-
.../prog/en/modules/virtualshelves/sendshelf.tt | 2 -
.../en/modules/opac-authoritiessearchresultlist.tt | 6 +-
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 +-
.../bootstrap/en/modules/opac-sendbasket.tt | 2 -
.../bootstrap/en/modules/opac-sendshelf.tt | 2 -
.../bootstrap/en/modules/opac-shareshelf.tt | 17 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 8 +-
.../bootstrap/en/modules/opac-showreviews.tt | 2 +-
.../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 52 +-
.../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 50 +
kohaversion.pl | 2 +-
misc/plack/koha.psgi | 12 +
misc/translator/po/bn-IN-marc-MARC21.po |14119 ++++++
misc/translator/po/bn-IN-marc-NORMARC.po | 2837 ++
misc/translator/po/bn-IN-marc-UNIMARC.po |13065 ++++++
...n-opac-bootstrap.po => bn-IN-opac-bootstrap.po} | 0
misc/translator/po/{ben-pref.po => bn-IN-pref.po} | 0
.../po/{ben-staff-help.po => bn-IN-staff-help.po} | 0
misc/translator/po/bn-IN-staff-prog.po |47733 ++++++++++++++++++++
opac/opac-readingrecord.pl | 1 +
opac/opac-reserve.pl | 1 +
opac/opac-sendbasket.pl | 2 -
opac/opac-sendshelf.pl | 1 -
opac/opac-shareshelf.pl | 6 +
opac/opac-tags_subject.pl | 4 +-
reports/guided_reports.pl | 17 +-
reports/issues_avg_stats.pl | 84 +-
svc/checkouts | 2 +-
t/Charset.t | 4 +-
t/db_dependent/Letters.t | 17 +-
tools/inventory.pl | 10 +-
tools/modborrowers.pl | 6 +-
tools/picture-upload.pl | 4 +-
tools/viewlog.pl | 1 +
virtualshelves/sendshelf.pl | 1 -
67 files changed, 78157 insertions(+), 204 deletions(-)
create mode 100644 misc/translator/po/bn-IN-marc-MARC21.po
create mode 100644 misc/translator/po/bn-IN-marc-NORMARC.po
create mode 100644 misc/translator/po/bn-IN-marc-UNIMARC.po
rename misc/translator/po/{ben-opac-bootstrap.po => bn-IN-opac-bootstrap.po} (100%)
rename misc/translator/po/{ben-pref.po => bn-IN-pref.po} (100%)
rename misc/translator/po/{ben-staff-help.po => bn-IN-staff-help.po} (100%)
create mode 100644 misc/translator/po/bn-IN-staff-prog.po
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list