[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.01-17-ga5d72c8
Git repo owner
gitmaster at git.koha-community.org
Wed Jan 4 23:34:16 CET 2017
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.11.x has been updated
via a5d72c8989ac07c066832e31193702efef100a55 (commit)
via 9a22ae4fc5dfe3be8bdb5f5de2ef5a0377709c1a (commit)
via 9e6108965aff24d4d59496b6f5137e241e5e7e3e (commit)
via c1768e08cd82c8d2eaa9ac667004b8ad6ab36faf (commit)
via 70c55a6d69d68e04b50e8fbcf0eb7e62457350d7 (commit)
via 269bbee289e7faf1d30b133c4ea413a51229ff3e (commit)
via aae8f936df2e6e7a76da55151daa79138da3a277 (commit)
via ec1773b112eaa28a42b938d27980e9af6a87abab (commit)
via ff6a1f666f575f02258bf42b539536f79057046d (commit)
via 680b807653de19255b4df2c9ca3f4170a0217422 (commit)
via 3bfafe1802eea486bf72a1d1fd7374a6750245ee (commit)
via fae4342fdfec11f8c4a1a340ed23d1a0b6d7cdab (commit)
via f605be1cdd7000e32724aafc34c83be9718d5c3d (commit)
via d4302119f33f075d00b6b749e0123f54b9fc1768 (commit)
via 0e8569583f33cf57512e47eb403e50925d7a5a98 (commit)
via 9456d9e3f0753039cad8b2a2917da7cceb01d9f1 (commit)
via 5a69acb3915f1232de8fa803d16ddf5b47ea84a3 (commit)
from 4064c64fcc900ff4e58eb3f86889a8efdd90200d (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 a5d72c8989ac07c066832e31193702efef100a55
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jan 3 11:01:08 2017 +0000
Bug 14610 [QA Followup] - Minify opac.css
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 6b0562eee87e80532d6abb423177c76062be84cc)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9a22ae4fc5dfe3be8bdb5f5de2ef5a0377709c1a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 29 17:54:40 2016 +0100
Bug 17830: CSRF - Handle unicode characters in userid
If the userid of the logged in user contains unicode characters, the token
will not be generated correctly and Koha will crash with:
Wide character in subroutine entry at /usr/share/perl5/Digest/HMAC.pm line 63.
Test plan:
- Edit a superlibrarian user and set his/her userid to '❤' or any other strings
with unicode characters.
- Login using this patron
- Search for patrons and click on a result.
=> Without this patch, you will get a software error (with "Wide
character in subroutine entry" in the logs).
=> With this patch, everything will go fine
You can also test the other files modified by this patch.
Signed-off-by: Karam Qubsi <karamqubsi at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 4e40339db3209c913c79b935067e139b470255cc)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9e6108965aff24d4d59496b6f5137e241e5e7e3e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 28 13:14:06 2016 +0100
Bug 17820: use ->find instead of search->next
From C4::Auth:
my $patron = Koha::Patrons->search({ userid => $userid })->next;
This should be replaced with
my $patron = Koha::Patrons->find({ userid => $userid });
userid is a unique key
Caught with NYTProf:
# spent 78.9ms making 1 call to Koha::Objects::next
Test plan:
Login at the intranet
Reload the page
=> You must still be logged in
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested by enabling TrackLastPatronActivity and logging in again.
Verified lastseen column in borrowers.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit af171f9b21da8fa1c22754caa541e826ffeee529)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c1768e08cd82c8d2eaa9ac667004b8ad6ab36faf
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Dec 2 19:37:07 2016 +0000
Bug 15711: Follow up batch_id not used
Changed batch_id to image_id in the template, as the multiparam
would catch the array case.
TEST PLAN
---------
1) attempt to delete a selected item, but get a warning.
2) apply this follow up
3) attempt to delete a selected item, it deletes.
4) run koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
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 2ee5cd27129d487fee26987118a8675033139c53)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 70c55a6d69d68e04b50e8fbcf0eb7e62457350d7
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Aug 24 01:08:11 2016 +0000
Bug 15711: Fixing the 'Delete selected' button on patroncard images
To test:
1) Go to Tools -> Patron Card Creator -> Manage images
2) Upload an image if you haven't already
3) Click Delete selected without selecting any images
4) Notice broken behaviour as described in Description
5) Apply patch, refresh page
6) Click Delete selected without selecting any images
7) Notice alert. Click OK
8) Select one image or more, click Delete selected
9) Notice confirm delete message.
Sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
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 bd3879e037727cdc2cc851aa910c68bd257ee6f4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 269bbee289e7faf1d30b133c4ea413a51229ff3e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Dec 20 16:11:36 2016 +0100
Bug 17785: Fix OAI-PMH's XSLT-generated URLs under Plack
Look at e.g. the URL for Show More at the end of the output of Records or
Identifiers. If you use Plack, you will see that it refers to
yourserver:/opac/oai.pl, which is not correct.
This is caused by using CGI's self_url in combination with script alias,
mounting point, etc. Note that we cannot solve this problem in the code of
Koha only. Since HTTP::OAI modules also call self_url, we still end up
with some wrong url's.
Instead of a larger architectural operation on Apache and Plack config files,
this patch adjusts the final xslt transformation on the OAI response.
It hardcodes the correct path only once, in a xslt variable. And replaces
all oai:OAI-PMH/oai:request/text() calls, containing wrong URLs, by this
variable.
Test plan:
Run oai.pl. Try the various verbs.
Verify that the URLs point to /cgi-bin/koha/oai.pl.
Edit: changed commit subject
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Works as expected. Good workaround until a definitive solution is implemented.
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 1b492938e4eee4d1babe26417cfbf69cede2b844)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit aae8f936df2e6e7a76da55151daa79138da3a277
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Dec 22 14:00:37 2016 +0000
Bug 17781 - Improper branchcode set during renewal
For no discernable reason, when AddIssue calls AddRenewal, it passes the
branchcode generated from _GetCircControlBranch. Assume
_GetCircControlBranch is set to return items.homebranch. So:
1) If an item owned by LibraryA is checked out at LibraryB, the
statistic line branchcode will be LibraryB
2) If an item is renewed via the ajax datatables renewal function, the
statistic line branchcode will be LibraryB the
3) If an item is renewed via scanning the item into the checkout again,
statistic line branchcode will be *LibraryA*
This is clearly improper behavior. The renewal is taking place at
LibraryB, so the branchcode passed to AddRenewal should be LibraryB,
the logged in library. This also jives with the documentation for
the subroutine.
Test Plan:
1) Set CircControl to "the library the item is from" aka ( ItemHomeLibrary )
2) Set HomeOrHoldingBranch to 'The library the items is from" ( aka homebranch )
3) Create item with homebranch of LibraryA and holdingbranch of LibraryB
4) Set the logged in library to LibraryB
4) Check the item out to a patron at LibraryB
5) Note the statistics line has a branchcode of LibraryB
6) Check the item out again to trigger a renewal, renew the item
7) Note the statistic line has a branchcode of LibraryA!
8) Apply this patch
9) Repeat step 6
10) Note the statistics line has a branchcode of LibraryB!
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: David Kuhn <kuhn at monterey.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 2c67648093b9e7479b1dd1135c80ada2d46aee7c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ec1773b112eaa28a42b938d27980e9af6a87abab
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 28 09:57:14 2016 +0100
Bug 17742: Use TestBuilder to create the library and patron category
Moreover we do not need to remove the existing issues and patrons
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 853d355576698d1643080ef37b797e937338a1f8)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ff6a1f666f575f02258bf42b539536f79057046d
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Dec 6 21:07:56 2016 +0000
Bug 17742: Fix t/db_dependent/Patrons.t
Moves the getting of testing date for updated_on just after the storing
the test patron data to make the gap between generating data and now
date as short as possible
Fixes test 7
Use Koha::Database instead of C4::Context->dbh
Test plan
1. prove t/db_dependent/Patrons.t
2. read the diff
NOTE: Only minor improvement could be using test builder to
generate the category and branch codes, rather than assume
data exists. However, that is beyond scope of this bug.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 5c2618d653f6a8fe4b220f1ca986c8d6c58264e3)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 680b807653de19255b4df2c9ca3f4170a0217422
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 5 09:54:35 2016 +0100
Bug 17246: Do no support arrayref to define multiple FK
Currently you can call GetPreparedLetter like:
$prepared_letter = GetPreparedLetter(
(
module => 'test',
letter_code => 'TEST_HOLD',
tables => {
reserves => [ $fk1, $fk2 ],
},
)
);
It assumes that $fk1 is a borrowernumber and $fk2 a biblionumber.
It seems hazardous to do this guess.
I suggest to remove this feature and only allow hashref indeed.
Test plan:
Use different way to generate letters and make sure you do not reach the croak
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ea7bd9c4ada6eb6f03d37e43cce89d1431293761)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3bfafe1802eea486bf72a1d1fd7374a6750245ee
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Dec 23 13:35:34 2016 +0000
Bug 14637: Followup - Fix number of tests due to rebase
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 0747a11b2648a20fcca9d3f5e02a4b3b9270b3f3)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit fae4342fdfec11f8c4a1a340ed23d1a0b6d7cdab
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 6 10:40:46 2016 +0100
Bug 14637: Fix add patron category under MySQL 5.7
If no dateofbirthrequired or upperagelimit is set on the interface, the
->store method will receive an empty string defined for these values.
For INT field, we must explicitely set these empty value to undef
instead to avoid MySQL 5.7 (and strict mode) to raise:
DBD::mysql::st execute failed: Incorrect integer value: ' for column
'dateofbirthrequired''
Test plan:
Using MySQL 5.7 (and/or sql_mode=STRICT_TRANS_TABLES)
Create a patron category without specifying upperagelimit or
dateofbirthrequired
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit a28334aeceba9ea8fcfcd301c4c01f473110bbe3)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f605be1cdd7000e32724aafc34c83be9718d5c3d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 6 10:40:28 2016 +0100
Bug 14637: Fix add patron category under MySQL 5.7 - tests
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 5ea0b70dad5213292cb678f38a8b93e5118bdf4d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit d4302119f33f075d00b6b749e0123f54b9fc1768
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Dec 23 11:31:00 2016 +0000
Bug 15415 [QA Followup] - Make code more readable
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 8e68e41df448e9bde7baf69ebab2646d2138cca4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 0e8569583f33cf57512e47eb403e50925d7a5a98
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Fri Dec 2 03:04:07 2016 +0000
Bug 15415: Warn when creating a new print profile
As per Jonathan's comment in Comment 3, I've put that line of code in an
if statement that will only call the get_attr method if we are editing
an existing profile (therefore the profile id will exist).
To test:
1) Go to Tools -> Patron Card Creator -> New printer profile
2) Notice warn
3) Apply patch
4) Refresh page
5) Confirm warn is gone and page still works as expected
Sponsored-by: Catalyst IT
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 47e80e899aca7c79aaeb58350401a1963fbe709d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9456d9e3f0753039cad8b2a2917da7cceb01d9f1
Author: Dani Elder <dani at bywatersolutions.com>
Date: Mon Oct 10 09:51:43 2016 -0400
Bug 16933 - Update documentation/help file.
Updates help documentation about Alt+W to open renew tab.
To test: Go to circulation help page, open help file and see that new
line mentioning Alt+W.
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit f15eb9d5f534489585f2819ccbce43e6ddc95511)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5a69acb3915f1232de8fa803d16ddf5b47ea84a3
Author: Tim McMahon <tmcmahon at wlpl.org>
Date: Thu Sep 8 12:19:17 2016 -0400
Bug 16933 - Alt-Y not working on "Please confirm checkout" dialogs
This patch changes the keyboard shortcut for renew from Alt+y to Alt+w.
To test:
1) Press Alt+y when you get a "Please confirm checkout" dialog.
2) The renew tab is selected instead of confirming the dialog.
3) Apply the patch and refresh your browser to load the change.
4) Repeat step one.
5) Alt+y confirms the checkout, Alt+w selects the renew tab.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit fc676f4130b399b2f69878760e699c6d01fd262a)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 2 +-
C4/Circulation.pm | 22 +-
C4/Letters.pm | 5 +-
Koha/Patron/Category.pm | 21 +
basket/sendbasket.pl | 4 +-
.../prog/en/modules/help/circ/circulation-home.tt | 1 +
.../prog/en/modules/patroncards/image-manage.tt | 19 +-
koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2846 +-------------------
koha-tmpl/opac-tmpl/xslt/OAI.xslt | 28 +-
members/deletemem.pl | 4 +-
members/member-password.pl | 4 +-
members/memberentry.pl | 4 +-
members/moremember.pl | 2 +-
opac/opac-memberentry.pl | 8 +-
opac/opac-sendbasket.pl | 4 +-
patroncards/edit-profile.pl | 5 +-
t/db_dependent/Circulation/issue.t | 26 +-
t/db_dependent/Koha/Patron/Categories.t | 12 +-
t/db_dependent/Letters/TemplateToolkit.t | 19 +-
t/db_dependent/Patrons.t | 29 +-
tools/import_borrowers.pl | 4 +-
tools/picture-upload.pl | 6 +-
23 files changed, 152 insertions(+), 2925 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list