[koha-commits] main Koha release repository branch 16.05.x updated. v16.05.02-01-97-g26a318e
Git repo owner
gitmaster at git.koha-community.org
Tue Aug 23 12:49:42 CEST 2016
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, 16.05.x has been updated
via 26a318e97ee84c1caf88e1e7820fb0467b754e48 (commit)
via 030487d9e341a16b7220d4c45e8f8e3677844906 (commit)
via 88b82cd053d6ab86342578a76a628d1ad8e70203 (commit)
via 06e37a47df894b42accbd1b98c734515ff3b3e12 (commit)
via 7602198e60e0a43c1d35164db2c49d26412bfc08 (commit)
via 2ce7bf6ed5c6d74e3635666f93ef9e1f90d091c0 (commit)
via 7547ffcc96a43fb4228896a431344155c72bc910 (commit)
via 6551bebd939aefb3a4e6c59d3bee83c311cd842d (commit)
via 700c602634390f34a3fac86c158d95b30bc03963 (commit)
via e97d132cc64fad0f3ef6ddf391f40699ea41ea95 (commit)
via c05e2c13552ec9236de8ba8052864d91134516a3 (commit)
via dc08197e16e8acf7e53e37fc4f22120a3f1a9c05 (commit)
via 803ad5b022e0c469d27336bdcdfb4966f3f01960 (commit)
via 1c34dd1b1037cdddcb18e106e732e8d5375a8490 (commit)
via ebe7e4e48a128c6d3962ab5c8a6f679dab99bc92 (commit)
via 24d83b1bcb6fc595fabb7fb4fcf43645890d24f0 (commit)
via d9def60267c1eb8aaacf4958de3bbddbace27621 (commit)
via 3a5e20809c191ed5773e70f09c0096d14cade6c9 (commit)
via ba5ac05a140f62c6bb8383049bcfeba5c96a7de5 (commit)
via 16769bdb1445bcccd3be0221ba69917344f363e9 (commit)
via 3b4564001d571304490fe81dbd92e656fc9ad53e (commit)
via e091cab5031a21a7a85dc32a52e9ae89fcc74caa (commit)
via 1a447ccde4f7e2747a33b77292b2ca12ebb2dd7a (commit)
via 672e02bf6bfecabf2301ce2291ca337bac0b7667 (commit)
via 527cd879bb832feb1a73afb85ffb948bb4c0ee64 (commit)
via a86c2250100b898d0c537497c5b6ad20eb969d28 (commit)
via f13a576bf5b1b10d2ea54b89eac44cc95270b386 (commit)
via 1adcd737574fcbde4a86c5b3b72718c5e5ba21da (commit)
via 7608e82dff0e9ca1b66426632053c4516bd88c2e (commit)
via 2dc212beef4f4baa56e2c2cac00cdf038989f884 (commit)
via cb53c0bedabfa9590efc95dfabeb375960799d0a (commit)
via a82c64a7ec504de92a7fb69282fb8ef27a56dd67 (commit)
via 68a4549aa9fd36904c8b7fb321d14ac1946bc485 (commit)
via 8ff5f08edd0dc434e56d35cb4956df6027f0eed6 (commit)
via 55bdbc09e6a60d417cbc2d88bb90241fcac57aa2 (commit)
via e378c47bada7d244f09d354d14df72092ced8f61 (commit)
via f81c6770054dab1cb4b4a1ccea1b28bd702b412b (commit)
via a42da0108e3f8dee889ef28e0c0d736e23a9aacc (commit)
via 2b62fbde3357b396d72cbce7d625b096c0467307 (commit)
via 86985bffc49977c97c6de98edc68ad3c3f917039 (commit)
via 4267b60311227453335d9c4f64cb9d5c0946ced7 (commit)
via e3da772c3cd10ab999b7ee5708c6eab5dfb0599d (commit)
via 97f1d825cd4031e0c9077d9d8cf0f0c7f69d894c (commit)
via 3bf66eb1a1af1f917ffbf3865762cac64bfdbaef (commit)
via 4f5121a99e063fc05fb19caac89e5a56b1ff0afb (commit)
via d432c5bba836601b809a9f807af05ef85e952453 (commit)
via 990aca1cb7548bcead783f40661acb156952d09a (commit)
via f0e08942d79caca7a47dc6bdb8f7ea01a83c5333 (commit)
via 57e2a013cc78db4e26367cbfd34bc0054e67a3ba (commit)
via 1d2da8fcd06e1f396d63fd834771f2a208fc5b91 (commit)
via 17a103d8a06345ad39e3af9c0d3a50c3f24ce5e7 (commit)
via 15d16c5273231190e1d9efcce2a2c7ed34f69207 (commit)
via 2af25f1c80af547b90106ce6cb4d31d0ba5d63ad (commit)
from 3316fbad242cc609aaa306320e68015c1343c60d (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 26a318e97ee84c1caf88e1e7820fb0467b754e48
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 22 13:07:54 2016 +0100
Bug 17023: Repair "cancel" link
The basketno param has been removed in previous patch.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 3315a883ed055554627c26ace0581e8fd6426b83)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 030487d9e341a16b7220d4c45e8f8e3677844906
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Aug 11 10:39:31 2016 +0200
Bug 17106 - DataTables patron search defaulting to 'starts_with' - doc
Bug 15930 modified default value for DataTables patron search.
The doc text should also be modified :
"Can be 'contain' or 'start_with' (default value). Used for the
searchmember parameter."
Test plan :
- install Koha with patch
- look at man page man/man3/C4::Utils::DataTables::Members.3pm
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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 29b4ee5c74949d9706387b1d02b858cd697a57d6)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 88b82cd053d6ab86342578a76a628d1ad8e70203
Author: Marc Véron <veron at veron.ch>
Date: Wed Aug 10 10:12:55 2016 +0200
Bug 16741 - Remove dead code "sub itemissues" from C4/Circulation.pm
To verify:
- git grep itemissues
Result: Appears in C4/Circulation.pm only
To test:
- apply patch
- git grep itemissues
Expected result: No occurences
- prove t/db_dependent/Circulation.t
Expected result: Pass OK
Signed-off-by: Claire Gravely <c.gravely at arts.ac.uk>
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 97552074f028eefe81d27a4cba681bd5f0f1cd95)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 06e37a47df894b42accbd1b98c734515ff3b3e12
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 15 15:11:19 2016 +0100
Bug 17100: Restore previous logic
There is no need to change the previous logic here, so let's restore it.
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 f8230d5d0a6f20f0e054744221d5ad4b1ca467e3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 7602198e60e0a43c1d35164db2c49d26412bfc08
Author: Marc Véron <veron at veron.ch>
Date: Wed Aug 10 11:42:28 2016 +0200
Bug 17100: Do not display payments if patron has nothing to pay
This alternative patch moves logic and formatting to the template file.
To test:
* without patch
1/ find a patron with no lines in accountlines table : print summary shows no "account fines and payments" => OK
2/ find a patron with some lines in accountlines table and the total amount > 0 : print summary shows a table "account fines and payments" with fines to recover => OK
3/ find a patron with some lines in accountlines table but the total amount = 0 : print summary shows a table "account fines and payments" with nothing in it => NOK
* with the patch, same cases as before :
1/ same as without patch
2/ same as without patch
3/ print summary does not show "account fines and payments"
- Additionally, verify that formatting follows syspref 'CurrencyFormat'
- Verify that amount column is right-aligned
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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 492a64cef95c6afb1644cbb4f1be181c2442cbd8)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 2ce7bf6ed5c6d74e3635666f93ef9e1f90d091c0
Author: Galen Charlton <gmcharlt at gmail.com>
Date: Fri Jul 29 20:41:19 2016 +0000
Bug 17001: fix due date filter on the overdue report
When the TimeFormat system preference is set to "12 hour",
setting a filter on the due date can result in:
- no overdue loans being reported, even if there are some
that meet the criteria
OR
- overdue loans being omitted from the report if they
are due on the "until" date in the filter
This patch fixes this by replacing output_pref() with
DateTime::Format::MySQL to format the date filter values
to pass to the SQL query.
To test
-------
[1] Run the overdue report (circ/overdue.pl) and set a filter
on due date, using values that should bring up one or
more overdue loans.
[2] Note that zero overdue loans are returned (if using MySQL
5.5, 5.6, or 5.7 or MariaDB 5) or that loans due on the
"until" date are omitted (if using MarioDB 10).
[3] Apply the patch and repeat step 1. This time, the correct
set of overdue loans should be reported.
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 761001add1a95d147a23b74e8d817890ffc08ac5)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 7547ffcc96a43fb4228896a431344155c72bc910
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Aug 11 10:58:40 2016 +0200
Bug 17107 - Add ident and Identifier-standard to known indexes
Add ident and Identifier-standard to known indexes in C4::Search::getIndexes().
Those indexes can be very useful, for example for IdRef feature.
Test plan :
- Make sure some records have a field indexed with Identifier-standard, ISBN=1234 for example
- Perform a search /cgi-bin/koha/opac-search.pl?idx=ident,phr&q=1234
=> you find the record
- Perform a search /cgi-bin/koha/opac-search.pl?q=ident:1234
=> Without patch : you get no results
=> With patch : you find the record
Idem for 'Identifier-standard'
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 4884f3a00a99c959059b7d12544c271a1e1ab616)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 6551bebd939aefb3a4e6c59d3bee83c311cd842d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 1 13:46:49 2016 +0100
Bug 17009: Speed up the framework duplication
To duplicate frameworks, the code retrieve all the subfields, then
execute 1 insert per subfield.
It's unnecessary slow, we can use the DBMS to do it.
Test plan:
Create a new framework and duplicate the structure of another framework.
Signed-off-by: Marc <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 739eaa82e8b52a1ef83e995badc7ddfa3a32e3fc)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 700c602634390f34a3fac86c158d95b30bc03963
Author: Jacek Ablewicz <abl at biblos.pk.edu.pl>
Date: Fri Aug 12 16:19:52 2016 +0200
Bug 17117: Patron personal details not displayed unless branch update request is enabled
In patron acount ("your personal details" tab, which serves as a form
for submitting update requests as well) it's not possible to display
some account details like expiration date etc., without enabling
the field for branch / library update requests too.
To reproduce:
1) set OPACPatronDetails to "Allow"
2) clear PatronSelfModificationBorrowerUnwantedField preference
- all possible fields in the update requests form are visible
in patron account, including some extra details (card number,
expiration date, category) in the "Library" section on top
3) put 'branchcode' in PatronSelfModificationBorrowerUnwantedField preference
4) the whole 'Library' section disappears
To test:
1) apply patch
2) put 'branchcode' in PatronSelfModificationBorrowerUnwantedField,
'Library' section should remain visible (sans branch selection option)
3) put 'branchcode|cardnumber|datexpiry|categorycode' in the same
preference, 'Library' section should now disappear
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit fb449aaede3f23ee71e9e50286a26035bb3ef640)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit e97d132cc64fad0f3ef6ddf391f40699ea41ea95
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 15 09:26:16 2016 +0100
Bug 17124: Fix tests in DecreaseLoanHighHolds.t
One test of DecreaseLoanHighHolds.t does not pass,
A hashref representing a patron has a 'borrower' key defined, instead of
'borrowernumber'.
Test plan:
prove t/db_dependent/DecreaseLoanHighHolds.t
must return green
Signed-off-by: Claire Gravely <claire_gravely at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 1bc34e31e9c371d8f60a074f13e933d15a31e20e)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c05e2c13552ec9236de8ba8052864d91134516a3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 09:43:01 2016 +0100
Bug 16955: Do not clear from cache when adding a new framework
There are several issues with these lines:
1/ $cache is not defined correctly and it not visible inside
duplicate_framework
2/ $frameworkcode is a wrong c/p, it should be $newframeworkcode
3/ these calls are not needed. As we are creating a new framework, the cache
should be empty...
This patch will simply remove these calls
Test plan:
Duplicate a framework and confirm that you do not get any error in your
logs.
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 84812129c979557cd2232c3a8b5b0f01c368a634)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit dc08197e16e8acf7e53e37fc4f22120a3f1a9c05
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 8 15:11:56 2016 +0100
Bug 16996: (follow-up) Do not explode if mandatory fields are missing
When registering a new patron, if something went wrong, the form is
resent to the template but without the categorycode (not a dropdown list
anymore, but just displayed as a readonly value # TODO LATER).
Signed-off-by: Marc <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 6cd1891ffe5903a09e2deb04e852e967a2187ba0)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 803ad5b022e0c469d27336bdcdfb4966f3f01960
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 3 16:28:24 2016 +0100
Bug 16996: Do not explode if mandatory fields are missing
At the OPAC, if a patron modify his/her information and at least 1
mandatory field is missing, Koha will crash with
Template process failed: undef error - Can't call method "description"
It is raised by Koha::Template::Plugin::Categories::GetName called with
an undefined categorycode.
The problem is that the values sent originaly are not sent back to the
template if the user missed something.
This patch makes that all info are resent to the template in order to
show the same form to the user.
Test plan:
0. Apply patch
1. Make sure that the categorycode is not hidden in the OPAC in:
PatronSelfRegistrationBorrowerUnwantedField or PatronSelfModificationBorrowerUnwantedField
2. Add a required field in PatronSelfRegistrationBorrowerMandatoryField, for example email.
3. Go to Your Personal Details in the OPAC (opac-memberentry.pl) and leave blank the required field of point 2
4. Press "Submit update request"
There should be no software error.
NOTE: The warns will be floody on the logs.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marc <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 8c5cb134ee75aad77a9ba9b9fd84005fc0a9feb3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 1c34dd1b1037cdddcb18e106e732e8d5375a8490
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 15 13:15:22 2016 +0100
Bug 16615: Update OPACSearchForTitleIn to access openlibrary.org via https
Note that we could also update the syspref for existing installs
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 8a7266cd0d12f8933e9598a4e954ecd2977b89b8)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit ebe7e4e48a128c6d3962ab5c8a6f679dab99bc92
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Sun Aug 14 13:01:47 2016 -0400
Bug 16615: Follow up - missed a spot
Also, it is recommended to apply bug 17103 before this.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Oliver Bock <oliver.bock at aei.mpg.de>
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 c0ac389c1ec5422795bd6976a29e140a945f967d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 24d83b1bcb6fc595fabb7fb4fcf43645890d24f0
Author: Oliver Bock <oliver.bock at aei.mpg.de>
Date: Mon May 30 07:35:26 2016 +0000
Bug 16615: Open Library API fails for full-site-SSL
When running Koha in a full-site-SSL configuration accessing
external resouces like Open Library cover images via HTTP
doesn't work (mixed SSL/non-SSL content). It thus breaks a
core feature of Koha. Referencing such resources always via
HTTPS resolves the problem and also enhances privacy as a
side-effect.
Previous tickets took care of Amazon resources. This ticket
is supposed to address the remaining external resource providers,
starting with Open Library.
TEST PLAN
---------
1) Over https access your OPAC with the Enhanced Content system
preferences 'OpenLibraryCovers' set to 'Add', and
'OpenLibrarySearch' set to 'Show'.
2) Search for something (e.g. Mo Willems)
-- Your browser console log will show messages about
mixed content.
3) Apply the patch
4) Making sure to reload the java script, attempt steps 1 & 2
again.
-- no mixed content messages should be given
5) run koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 40b9645bf6d822e7e1895587b44889c193af14ac)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit d9def60267c1eb8aaacf4958de3bbddbace27621
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date: Thu Sep 17 13:23:49 2015 +0300
Bug 14844: Corrupted storable string. When adding/editing an Item, cookie LastCreatedItem might be corrupted.
No idea how to replicate this issue but we have been getting several reports
about the following error:
Software error:
Corrupted storable string (binary v2.9) at /usr/lib/perl/5.18/Storable.pm line
417, at /home/koha/kohaclone/cataloguing/additem.pl line 375.
TEST PLAN:
1. Add or modify an Item.
2. No observed changes.
?. We don't know what causes this but we know that add/modify Item occasionally
crashes due to failure of a cookie thawing.
This patch prevents the whole program from dying, because this error is not
critical enough to warrant dying.
Also there is no centralized mechanism in Koha for showing messages to the
user, so there is no easy and convenient way to warn the user that the:
'LastCreatedItem'-cookie or the systempreference 'PrefillItem' is
malfunctioning.
So we instead just warn to the server logs with the malfunctioning cookie in
hopes of nailing down what causes the issues.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
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 9237fe676336f5908a9acc26a3b70b70d25602ae)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3a5e20809c191ed5773e70f09c0096d14cade6c9
Author: Indranil Das Gupta (L2C2 Technologies) <indradg at l2c2.co.in>
Date: Sat Aug 13 05:55:14 2016 +0530
Bug 17103 - Google API Loader jsapi called over http
This patch replaces the hardcoded protocol ("http") from the URI with
https since that is what Google defacto uses to serve JS resources
Prevents MIXED CONTENT failure, allowing GoogleIndicTransliteration
to function correctly when used in SSLized OPACs.
Test plan
---------
1/ Make sure your OPAC is being served both over HTTP and HTTPS
2/ Set GoogleIndicTransliteration syspref to "Show"
3/ Access the OPAC over http, Google transliteration element will
show up in masthead searchbox.
4/ Access the OPAC over https. The element will not show. Console
will show MIXED CONTENT error and failure of google loader.
5/ Apply patch. Repeat steps #3 and #4 again. Now in both cases
GoogleIndicTransliteration will work.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 6fcd32a75c41c7815a883cc4952899ea24045b3c)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit ba5ac05a140f62c6bb8383049bcfeba5c96a7de5
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date: Mon Jul 25 15:08:00 2016 -0300
Bug 16974: Make koha-plack should check and fix log files permissions
This patch adds a function to the koha-plack script so it checks for log file
existence and its permissions. This function is called from the start_plack function.
If some of this conditions are not fulfilled, it solves the situation by either
touching and/or changing the permissions accordingly for the instances' plack log files.
To test:
- Run (on kohadevbox):
$ cd kohaclone
$ debian/scripts/koha-plack --start kohadev
$ debian/scripts/koha-plack --stop kohadev
$ ls /var/log/koha/kohadev/plack*
- Verify ownership of the created files (they might belong to the root user)
- Apply the patch
- Run:
$ chown root:root /var/log/koha/kohadev/plack*
$ debian/scripts/koha-plack --start kohadev
$ ls /var/log/koha/kohadev/plack*
=> SUCCESS: Files belong to kohadev-koha:kohadev-koha
- Run:
$ debian/scripts/koha-plack --stop kohadev
$ rm /var/log/koha/kohadev/plack*
$ debian/scripts/koha-plack --start kohadev
$ ls /var/log/koha/kohadev/plack*
=> SUCCESS: Files are created and belong to kohadev-koha:kohadev-koha
- Sign off :-D
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
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 007d2feee6b2fec92f2d6518a3e84de0f6476b3d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 16769bdb1445bcccd3be0221ba69917344f363e9
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Aug 2 23:26:03 2016 -0400
Bug 16885: koha-stop-zebra should be more sure of stopping zebrasrv
This patch follows Galen's suggestion in comment #7.
TEST PLAN
---------
1) Back up your koha logs as desired.
2) add something to /var/log/koha/{instance name}/intranet-error.log
3) ps aux | grep zebra
4) logrotate -f /etc/logrotate.d/koha-common
5) ps aux | grep zebra
-- the zebrasrv and daemon process for zebra indexing
didn't restart.
6) apply this patch against /usr/sbin/koha-stop-zebra
7) sudo koha-start-zebra {instance name}
8) ps aux | grep zebra
-- the processes should have started up again.
9) add different junk to /var/log/koha/{instance name}/intranet-error.log
10) ps aux | grep zebra
11) logrotate -f /etc/logrotate.d/koha-common
12) ps aux | grep zebra
-- the process ids for the zebrasrv and daemon processes should
be different, but the number of processes is the same as before.
13) sign off, because its less ugly than comment #3
Sponsored-by: Tulong Aklatan
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Works as expected, no regressions found.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ac4a058b05fc1a1a6955d025328cca6ae369baeb)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3b4564001d571304490fe81dbd92e656fc9ad53e
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date: Tue Jul 19 14:58:58 2016 -0600
Bug 16944: Add "email" and "url" classes when edit or create a vendor
When edit or create a new vendor the two fields "email" and "website" don't test
if the data provided is right. When you add a direction like
"koha-community.org" without the protocol "https" the program redirect to an
404 error.
To reproduce the issue:
1-Go to Acquisition and create a new Vendor
2-Fill the field Website with koha-community.org
3-Use an email without at sing (@)
4-Notice that there is no error
5-Save
6-Go to the vendor created (/cgi-bin/koha/acqui/supplier.pl?booksellerid=1)
7-Click in Website: koha-community.org -> redirect to an 404 error
8-Notice the bad mailto:
To test:
-Apply patch
-Reproduce step 1 to 8 with the same vendor or create a new one
-Enter multiple wrong and valid urls
-Enter urls with and without protocols http, https, ftp
-Enter wrong and valid emails
NOTE: The classes used are taken from 'branches.tt'
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
no longer allows entering of improper website urls or incomplete email addresses.
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 71d20a8c3b48a4dd1c7fb569b3baf2352d9757ac)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit e091cab5031a21a7a85dc32a52e9ae89fcc74caa
Author: Marc <veron at veron.ch>
Date: Thu Jul 21 11:42:42 2016 +0200
Bug 16953: Acquisitions home: Remove trailing › from breadcrumbs
The breadcrumb on the Acquisition's home page reads: Home > Acquisitions >
This tiny patch removes the trailing > (›)
Amended: Remove the link on 'Acquisitions' as well...
Signed-off-by: Claire Gravely <c.gravely at arts.ac.uk>
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 865557e05c0fa1951478fbc1551c50b9b928619a)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 1a447ccde4f7e2747a33b77292b2ca12ebb2dd7a
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date: Fri Jul 22 10:04:48 2016 -0600
Bug 16964: Fix capitalization for "Report Plugins" in reports-home.tt
Fix capitalization for "Report Plugins" in reports-home.tt according with
Coding Guidelines <https://wiki.koha-community.org/wiki/Coding_Guidelines#HTML4:_Upper_and_lower_cases_in_strings>
Signed-off-by: Marc <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 67a65ba16f9c56161fa936a4f80e3f93cfaef167)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 672e02bf6bfecabf2301ce2291ca337bac0b7667
Author: Marc <veron at veron.ch>
Date: Wed Jul 27 21:19:16 2016 +0200
Bug 16989 - Advanced search form does not display translated itemtype
In Staff client, the advanced serach form does not display the
translations of item types.
(Note: It is not necessary to have translations installed to verify
this bug.)
Prerequisites:
- Go to Home > Administration > Item types administration
- Edit e.g. item type "BK" (Book)
- Near "Description", click link "Translate into other languages
- If you have other languaes installed, add translatons for those
- If you have an Englis only installation, add a "translation" for
English, make sure that you can identify it while testing (I
used "BOOOOOOOOOOOOKS")
Verify:
- Go to Home › Advanced search
- Verify near "Limit to any of the following" that the description for
itemtype BK reads "Book" instead of "BOOOOOOOOOOOOKS"
Test:
- Apply patch
- Verify that the item type description now reads ""BOOOOOOOOOOOOKS"
- If you have a multi language installaton, verify that item types
you translated display as appropriate
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 4a691fda1622a4702ab34c0a55a56b344d07f109)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 527cd879bb832feb1a73afb85ffb948bb4c0ee64
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 4 17:19:37 2016 +0100
Bug 17052: Display patron category description in the sidebar of paycollect
The patron category description is not passed to the template in
paycollect.pl
Note: The Categories TT plugin should be used here...
Test plan:
Go on paycollect.pl and confirm that the patron category description is
now displayed in the sidebar.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Brendon Ford <brendon.ford at manhattan.edu>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit c3badb0c570beada485cc71ea6b494da1d59f1b0)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit a86c2250100b898d0c537497c5b6ad20eb969d28
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Aug 5 13:56:52 2016 +0000
Bug 17055 - Add classes to different note types to allow for styling on checkins page
Returned items may have 3 kinds of notes, patron, item public, and item
non-public. However, the html markup for them does not allow us to
distinguish which type we are seeing. It would be good to add classes
for each of these note types.
Test Plan:
1) Check out an item to a patron
2) Add a patron note, a public item note, and a non-public item note
to the patron and item you used
3) Check in the item and instead the html, note the each note span
now has a class to distinguish which type of note is being displayed.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit dbfda36767c113b8e515e8d2bfedd435ed7bd133)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit f13a576bf5b1b10d2ea54b89eac44cc95270b386
Author: Marc <veron at veron.ch>
Date: Mon Aug 8 14:04:44 2016 +0200
Bug 17078 - Format fines on opac-account.pl
To verify:
- Log in to OPAC as a user who has fines or credits
- Go to page "your fines"
- Verify that values for "Fine amount", "Amount outstanding"
and "Total due" are not formatted as defined in syspref CurrencyFormat
(e.g. for FR)
To test:
- Apply patch
- Repeat steps above
- Verify that values are formatted as appropriate with different
settings for syspref CurrencyFormat
Note: This patch does not force text alignment to the right.
Text alignement can be done using syspref OPACUserCSS
(td.sum, td.credit, td.debit)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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 d76737ba7d41bc261b59a2ea2cf4c591a62a0bc4)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 1adcd737574fcbde4a86c5b3b72718c5e5ba21da
Author: Marc <veron at veron.ch>
Date: Mon Aug 8 11:33:50 2016 +0200
Bug 17076 - Format fines in patron search results table
Format the values in patron search results following syspref CurrencyFormat.
To verify:
- Search for patrons who have fines or credits
- In result table, column 'Fines' does not respect syspref CurrencyFormat
(e.g. for FR)
To test:
- Apply patch
- Repeat steps above, verify that fines display as appropriate
- Change syspref Currencyformat, verify display
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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 6359922847aa9437bccc1d28fd429d5432517e9a)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 7608e82dff0e9ca1b66426632053c4516bd88c2e
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Mon Aug 8 16:13:37 2016 +0100
Bug 17081 Incorrect comparison operator used in edifactmsgs.pl
Numeric comparison operator is used where string comparison required,
resulting in the following warning in the log: 'Argument "delete" isn't
numeric in numeric eq (==).'
This patch corrects it to use 'eq' not '==' to compare strings.
To test, apply the patch and go to Acquisitions -> EDIFACT messages.
Delete an EDIFACT message. There should be no error in the error log.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit cc6fc0800cb3446ebe482b7dbb2f6ec4a543d869)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 2dc212beef4f4baa56e2c2cac00cdf038989f884
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Sun Jul 24 19:18:51 2016 +1200
Bug 16969 cgi->param used in list context in opac-memberentry.pl
To test
1/ Hit the page, notice the warning in the log
2/ Apply patch
3/ Hit page, notice no warning in the log
4/ Test functionality all still works
Works as expected. (Note: See Bug 16960 for updating patron details).
Signed-off-by: Marc <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 0ef3b19dbd414539dbc8c45ecc595e399df31781)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit cb53c0bedabfa9590efc95dfabeb375960799d0a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 3 15:48:42 2016 +0100
Bug 17040: Fix translation on context menu when editing items
Test plan:
update and install translated language files
On the item list (cataloguing/additem.pl) the context menu should be
translated (Edit item/Delete item)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 72150ee7596e2644febbab248e6b3c9b7b3af69b)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit a82c64a7ec504de92a7fb69282fb8ef27a56dd67
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jul 28 12:58:30 2016 +0100
Bug 17020: Do no pass findborrower to the template
Indeed, it's not used!
Test plan:
git grep '\[% findborrower'
should not return any result.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 5995bd77a630521c360735b22c8573717515e62a)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 68a4549aa9fd36904c8b7fb321d14ac1946bc485
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 3 16:41:48 2016 +0100
Bug 16894: Regression - Display email on patron search results
Bug 10318 added the email to the patron search results but it has been
removed later.
This patch reintroduced it where it was (no new column).
Test plan:
Search for patrons and confirm that the emails are displayed.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 034f939a44287ae7078d95c15b55368aa98b4216)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 8ff5f08edd0dc434e56d35cb4956df6027f0eed6
Author: phette23 <phette23 at gmail.com>
Date: Thu Jun 23 16:06:59 2016 -0700
Bug 16806: no error message for 'too_soon' renewal
To test:
- for a particular item type & patron category, configure a non-zero
"no renewal before" date so items can't be immediately renewed
- sign in as a patron in aforementioned patron category
- check out an item of aforementioned item type
- go to your renewals page in OPAC /cgi-bin/koha/opac-user.pl
- an error messages appears in the div.alert.dialog up top
Sponsored-by: California College of the Arts
Signed-off-by: Brendon Ford <brendon.ford at manhattan.edu>
Signed-off-by: Irma Birchall <irma at calyx.net.au>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit aa2f56fa1a76d98ab9543a100810c354c4d23554)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 55bdbc09e6a60d417cbc2d88bb90241fcac57aa2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jul 25 16:37:03 2016 +0100
Bug 16776: Do not forget external language choice in language switcher
If language is set by external link language switcher does not work
To reproduce:
- Have a multilingual koha installation, let's say en, de-CH, fr-FR and it-IT
- Create external links e.g. from your multilingual library website to each language variant of OPAC:
...cgi-bin/koha/opac-main.pl?language=en
...cgi-bin/koha/opac-main.pl?language=de-CH
...cgi-bin/koha/opac-main.pl?language=fr-FR
...cgi-bin/koha/opac-main.pl?language=it-IT
Each link opens fine displaying the language as appropriate.
Now try to switch language on the page you just opened via the external link.
It won't work, it will always stay on the language defined by the external link.
To test:
- Apply patch
- Repeat steps above
- Verify that the language switcher works
- Verify in browser address field that after switching language, the param 'language= 'has vanished from url string
- Try links with multiple params and with params containing 'language', e.g.
...cgi-bin/koha/opac-search.pl?language=fr-FR&q=language&mylanguage=test
- Verify that only the parameter 'language=' vanishes
Tested counter patch, works as well.
Signed-off-by: Marc <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 62d16aa6b750aaade2267596c19292659333f8c8)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit e378c47bada7d244f09d354d14df72092ced8f61
Author: Marc <veron at veron.ch>
Date: Mon Aug 8 17:47:31 2016 +0200
Bug 17082: Translatability: Fix sentence splitting in member.tt
This patch fixes sentences splitting in file
koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
Fix is done with a new .inc file because the code is the same as in
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
To test:
- Carefully review code changes
- Test on a fresh install without example data (or save database
and test with empty tables 'branches' and 'categories')
- Go to Home > Patrons (members-home.pl)
- Verify that a warnings appears aubout missing libraries and patron
categories
- Try to add a new patron (memberentry.pl)
- Verify that the same messages are triggered
- Verify that messages disappear as appropriate as soon as a library and
a patron category are defined.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Note: Filed Bug 17093 for JS error on patron entry form.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 5dd9a2546aea0870674bf2190a8f46c280b9beb2)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit f81c6770054dab1cb4b4a1ccea1b28bd702b412b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jul 4 11:53:39 2016 +0100
Bug 16848: Prevent invalid warning to be carped from output_pref
From Koha::DateUtils::output_pref:
$dt = eval { dt_from_string( $str ) } if $str;
carp "Invalid date '$str' passed to output_pref\n" if $@;
This second line is wrong: if $str does not exist, the first line is not evaluated and $@ could be filled with previous error.
To reproduce:
Then:
prove t/DateUtils.t
will display:
t/DateUtils.t .. 20/60 Use of uninitialized value $str in concatenation (.) or string at Koha/DateUtils.pm line 217.
Invalid date '' passed to output_pref
at t/DateUtils.t line 233.
t/DateUtils.t .. ok
All tests successful.
Files=1, Tests=60, 2 wallclock secs ( 0.02 usr 0.00 sys + 1.40 cusr 0.00 csys = 1.42 CPU)
Result: PASS
Test plan:
Without this patch, you should not see the carp
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit c31213ba4fab0082c6ad556aae424918b62205d0)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit a42da0108e3f8dee889ef28e0c0d736e23a9aacc
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Aug 8 01:15:23 2016 +0200
Bug 17074: Follow-up: fixing encoding issues with multiple search terms
If there was more than one search term you could see that that it
was url encoded. Also problems with search terms with umlauts and
other diacritics.
Patch should fix that.
https://bugs.koha-community.org/show_bug.cgi?id=17074
Signed-off-by: Marc <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 09d7a47f1fb1c645d0e3ffb93fb88409b3310363)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 2b62fbde3357b396d72cbce7d625b096c0467307
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Aug 7 16:03:13 2016 +0200
Bug 17074: Fix links in result list of 'scan indexes' and keep search term visible
The 'scan indexes' search that can be reached from the
advanced search has 2 problems to begin with:
- The search term you searched for is not displayed
in the input field.
- The links in the result list are missing the index
and because of that, are not giving the correct results.
To test:
- Go to the advanced search, select an index to search in
- Enter a search term and check 'scan indexes'
- Submit search
- Check if the search term is visible in the input box
- Check if the result links contain your selected index
and give you correct results (count and the number of
results should match)
Tested both patches together, works as expected.
Signed-off-by: Marc <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 8d7e62b808522b1871d6b704e0ae5def3be886ee)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 86985bffc49977c97c6de98edc68ad3c3f917039
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Sat Aug 6 10:13:18 2016 +0200
Bug 17053 Clearing search term in Reports
If you click the clear button to clear the search term it does take the search
term away. However, the next time you click on "Saved reports" the search term
is still there.
TO TEST:
1. Reports > Use saved
2. Filter on anything (date/author/keyword). Let say "foo" in keyword.
3. Click the Clear link on the Filter form. You can see that "foo" is removed
from keyword, and all the saved reports are displayed.
4. Click "Saved Reports" on the left. You can see that "foo" reappears in
keyword filter.
5. Apply the patch, and repeat steps 2-4.
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit aa0e27ea08cf0d9a1ff46b061cc38d2b15fa66e7)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 4267b60311227453335d9c4f64cb9d5c0946ced7
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Tue Aug 9 14:55:43 2016 +0200
Bug 17087 - Set Test::WWW::Mechanize version to 1.42
This was set to a version that is not available in Wheezy or Jessie.
The version is not required, the only change to 1.42 (packaged for
Wheezy and Jessie) is a fix for Windows, see
http://cpansearch.perl.org/src/PETDANCE/Test-WWW-Mechanize-1.44/Changes
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 893f6cc2633744d4f539fd1b6b9f4b8837277d2d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit e3da772c3cd10ab999b7ee5708c6eab5dfb0599d
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Sun Apr 10 23:18:26 2016 -0400
Bug 10148: Marc21 field 007 builder improper reload values
The more correct solution is fix that template file.
However, in the mean time, this works.
TEST PLAN
---------
1) find a record
2) edit record
3) click value builder for 007
4) change everything to pipes as much as possible.
(use Motion Picture to get all 00-22 values)
5) save
-- should save just fine.
6) click the value builder again
-- OOPS! Bad reload.
7) prove t/db_dependent/FrameworkPlugin.t
-- NOISY 007 messages.
8) apply patch
9) click the value builder again
-- good reload
10) prove t/db_dependent/FrameworkPlugin.t
-- No noise related to 007.
11) run koha qa test tools.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 22c851cc2fea3c3868f7643132392f0a34439c65)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 97f1d825cd4031e0c9077d9d8cf0f0c7f69d894c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 3 13:57:43 2016 +0100
Bug 17038: Fix XSS in catalogue/search.pl
Test plan:
Search for something like:
\";alert(1)//135
=> Without this patch you will see the alert
=> With this patch, no more alert
Note that this fix the parameters idx, q and op
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b543fa74fe888b9e53cfc06ac58e2f7ac1689ae5)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3bf66eb1a1af1f917ffbf3865762cac64bfdbaef
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 3 08:49:10 2016 +0100
Bug 17036: Fix XSS in circulation.pl
Test plan:
Enter the following in the "Check out" tab:
"><script>alert('XSS')</script>
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 96a9c2715ee2e4388e105e86e221bc280e1d757f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 4f5121a99e063fc05fb19caac89e5a56b1ff0afb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jul 28 13:01:43 2016 +0100
Bug 17021: Fix XSS in circ/returns.pl
Test plan:
Enter the following in the barcode input:
<script>alert('XSS')</script>
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 12b4c83f5a5c11af635cae83e6837ff80dc02da7)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit d432c5bba836601b809a9f807af05ef85e952453
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 14:46:11 2016 +0100
Bug 17025: Fix XSS in serials-search.pl
Test plan:
Hit
/serials/serials-search.pl?ISSN_filter="%2F><script>alert('XSS')<%2Fscript>&searched=1
/serials/serials-search.pl?title_filter="%2F><script>alert('XSS')<%2Fscript>&searched=1
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 1ea1504c30c5c34dd763027caee55dcf359e94cf)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 990aca1cb7548bcead783f40661acb156952d09a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 15:46:06 2016 +0100
Bug 17029: Fix XSS in catalogue/*detail.pl
Hit
/cgi-bin/koha/catalogue/detail.pl?biblionumber=1<script type="text/javascript">alert("XSS")</script>
/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=1<script type="text/javascript">alert("XSS")</script>
/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=1<script type="text/javascript">alert("XSS")</script>
/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=1<script type="text/javascript">alert("XSS")</script>
/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=1<script type="text/javascript">alert("XSS")</script>
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit f3a8e5a4117a0e95969ff2856dfcd95a6935ec55)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit f0e08942d79caca7a47dc6bdb8f7ea01a83c5333
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Wed Aug 10 13:28:20 2016 +0000
Bug 7441 - DBRev 16.05.02.003
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 57e2a013cc78db4e26367cbfd34bc0054e67a3ba
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Aug 10 07:15:03 2016 +0200
Bug 7441: QA follow-up - Add note about missing NORMARC support
Adds a note about missing support for NORMARC (only supports
MARC21 and UNIMARC) to the system preference text.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 821cb91a80942a85f4d22e6b1a8c700add7bab7d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 1d2da8fcd06e1f396d63fd834771f2a208fc5b91
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 24 16:08:23 2016 +0100
Bug 7441 - Followup search results showing wrong branch [UNIMARC]
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Playing with OPACResultsLibrary syspref, biblio with items having different
home/holding library are displayed properly.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 492d79a7df18efb294bd9bd9da5fa5b4efe1e592)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 17a103d8a06345ad39e3af9c0d3a50c3f24ce5e7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jun 2 14:01:56 2016 +0000
Bug 7441 - search results showing wrong branch?
When you search in the OPAC it shows you the HOME branch on the location
in XSLT, but if you click through to the detail page it shows you the
CURRENT BRANCH in the holdings table which is very confusing to patrons.
I don't know what's the right solution - home or holding branch, but they
should be the same in both places for the patron's sake. If you do the same
search in the staff client you see the right branch info on the search results
and on the detail page.
Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Search the catalog, you search should include results with items
that have different home and holding libraries.
4) The results should look the same as before the patch
5) Change the system preference OPACResultsLibrary to "current location"
6) Refresh your page of search results
7) The results show now show the holding library instead of the home library
Signed-off-by: Barbara Walters <bwalters at ncrl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 4db2e745e244bfc9e8315b4903c30e21142d9cb4)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 15d16c5273231190e1d9efcce2a2c7ed34f69207
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 20 11:29:01 2015 +0200
Bug 6499: [QA Follow-up] Trivial adjustments
Removes commented line from bib1.att.
Adjust OCLC-number to Other-control-number in comment of ccl properties.
No need to explicitly add 035$a and $z if you index 035 completely in
record.abs as well as biblio-koha-indexdefs.xml.
Rerun koha-indexdefs-to-zebra.xsl on index defs.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 5b4259be9c237c7773f6af9f6c83894718be603d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 2af25f1c80af547b90106ce6cb4d31d0ba5d63ad
Author: Barton Chittenden <barton at bywatersolutions.com>
Date: Thu Jul 10 09:54:56 2014 -0400
Bug 6499: Add Zebra index "Other-control-number" covering MARC21 035$a, 035$z and 035 (entire tag)
1) Apply patch
2) Make sure that you have a bib that has MARC21 035$a (and possibly also 035$z) populated.
pre 3) Replace all modified zebra files and restart zebra server
3) Rebuild zebra: misc/migration_tools/rebuild_zebra.pl -x -b -z
4) Add the following to the intranetuserjs syspref:
$(document).ready(function(){
// Add Other Control Number to advanced search
if (window.location.href.indexOf("catalogue/search.pl") > -1) {
$(".advsearch").append('<option value="Other-control-number">Other Control Number</option>');
}
});
5) Do an advanced search, select "Other Control Number" from the search menu, then add the Other Control Number in 035$a for the bib specified in step 1.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works, no koha-qa errors
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 84f51549c94a5f5fdc227e6febb472946ca2b71c)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 108 --------------------
C4/Installer/PerlDependencies.pm | 2 +-
C4/Search.pm | 3 +
C4/Utils/DataTables/Members.pm | 2 +-
C4/XSLT.pm | 19 ++--
Koha.pm | 2 +-
Koha/DateUtils.pm | 7 +-
acqui/edifactmsgs.pl | 2 +-
admin/marctagstructure.pl | 21 +---
catalogue/ISBDdetail.pl | 2 +
catalogue/MARCdetail.pl | 4 +-
catalogue/detail.pl | 2 +
catalogue/labeledMARCdetail.pl | 2 +
catalogue/moredetail.pl | 2 +
catalogue/search.pl | 13 ++-
cataloguing/additem.pl | 12 ++-
cataloguing/value_builder/marc21_field_007.pl | 101 +++++-------------
changelanguage.pl | 4 +-
circ/circulation.pl | 1 -
circ/overdue.pl | 5 +-
debian/scripts/koha-plack | 18 ++++
debian/scripts/koha-stop-zebra | 17 ++-
etc/zebradb/biblios/etc/bib1.att | 2 +-
etc/zebradb/ccl.properties | 3 +
.../marc21/biblios/biblio-koha-indexdefs.xml | 6 +-
.../marc21/biblios/biblio-zebra-indexdefs.xsl | 13 +++
etc/zebradb/marc_defs/marc21/biblios/record.abs | 2 +-
installer/data/mysql/sysprefs.sql | 3 +-
installer/data/mysql/updatedatabase.pl | 10 ++
.../prog/en/includes/noadd-warnings.inc | 11 ++
.../prog/en/includes/serials-search.inc | 6 +-
.../prog/en/includes/subscriptions-search.inc | 14 +--
.../prog/en/modules/acqui/acqui-home.tt | 2 +-
.../prog/en/modules/acqui/supplier.tt | 4 +-
.../prog/en/modules/acqui/z3950_search.tt | 2 +-
.../prog/en/modules/admin/preferences/opac.pref | 7 ++
.../prog/en/modules/catalogue/results.tt | 10 +-
.../prog/en/modules/cataloguing/additem.tt | 6 +-
.../prog/en/modules/circ/circulation.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 12 +--
.../prog/en/modules/members/member.tt | 13 +--
.../prog/en/modules/members/memberentrygen.tt | 4 +-
.../prog/en/modules/members/moremember-print.tt | 12 +--
.../en/modules/members/tables/members_results.tt | 5 +-
.../prog/en/modules/reports/reports-home.tt | 4 +-
.../bootstrap/en/includes/opac-bottom.inc | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-account.tt | 7 +-
.../bootstrap/en/modules/opac-memberentry.tt | 6 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 89 ++++++++++------
.../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 58 ++++++++---
koha-tmpl/opac-tmpl/bootstrap/js/openlibrary.js | 4 +-
members/paycollect.pl | 1 +
members/summary-print.pl | 9 +-
opac/opac-changelanguage.pl | 7 ++
opac/opac-memberentry.pl | 5 +-
reports/guided_reports.pl | 2 +-
t/db_dependent/DecreaseLoanHighHolds.t | 2 +-
58 files changed, 338 insertions(+), 358 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list