[koha-commits] main Koha release repository branch 16.05.x updated. v16.05.07-45-g1d2a92b
Git repo owner
gitmaster at git.koha-community.org
Fri Jan 27 03:25:36 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.05.x has been updated
via 1d2a92b485a6053af84bb7e7820b5aaa15860580 (commit)
via fd8ef06f0e2eeeb4d23d334127e9295f91b0462a (commit)
via 5a9f79c1bd3b1e35bbe80d98eef6d1e51354479f (commit)
via 1d28489f76a6890b38009e5f5b92ccd1d18051bc (commit)
via db708b9f37378656621e4d73e8a36c146730db5e (commit)
via f61451ff0ff5ca4bde8f5e1425caf37b501fb8ba (commit)
via cac98af1f40c753d094b4f1b69a638455c31d26f (commit)
via 1d8d9161fa0f917e7e974d0fe76ca400e7119658 (commit)
via 7859ea37b2bc2c9ae36b2e2f2907cade573ccaae (commit)
via 1fb7d9a869987b0e8de6cd7316ee78741a69c65f (commit)
via e8230c189da00b3b68c04c354ecb7cc6cacb4ad8 (commit)
via 8ecc75fb2498a55c98aad7743d8cb38ac5843f17 (commit)
via 2942adf41545b0e025f343ce60c2dfae9aa6a7c0 (commit)
via 34b296cc3b9e06d2a235239b2bff79f06c12c26f (commit)
via b4b66d6094fc5d806198844e5874896849899d14 (commit)
via 5c1ac983417fe5f6bb2b04c535638aed07d19502 (commit)
via 34568bac9fb3a35d44191cacfcfa36beb7ae0a1a (commit)
via 2f64ed22a6c54f5515c7d10fb3a9f55ac5853785 (commit)
via 406e52b1927bd343f1fa2ecadddd0af94d75bf17 (commit)
via 5938fdddd91cf6fa83ffa42df796927237dfdc2f (commit)
via bb5a88a3de811f4573a09a41571424e8c99e3ad5 (commit)
via 6b9cfe68d020ba82e05531e3c799714b5ef7e8a1 (commit)
via c0112d9907f36e0900f572c07a1001417196565a (commit)
via ed038fa7de708f43c5fb55f47f0be0558d272a6d (commit)
via 1e3214b676d91583af530336b64cbe682520892b (commit)
via f906e2f8608d29972d627d04eb5ccaac251d378c (commit)
via 6290c58a588192cade869e3a972a3dd3ff2dfb62 (commit)
via fee86bed56493ad8b55e139c28a0e95f26f4573e (commit)
via fad74240bc0b97b96a2b25f19b1e7c67896c884e (commit)
via f0303d7a75d7cc9f383322a01fee86e485a9f007 (commit)
via 61a585d81c819d0346c211b6ff7dc59a06eb35ec (commit)
via e79cca60a0c8083b0ec5b661a1e992f29c8cb9ae (commit)
via 364e53f739b65e2effcce2604edf97395176d01e (commit)
via dc1f045245bb5b582b2be96ad8b9761dba842eb5 (commit)
via 8bf19af1d097b1df6936bca1500a169bf78200b1 (commit)
via 8c2104062eaa6ea01c621cc31eeb146759008e2d (commit)
via 9077d5a172149c92485bb3b89778c6493a7d8f44 (commit)
via 1c0abdf23eca26ecadfd09af33b831867a8b983d (commit)
via bdc2efff620b09f8ab2c4b4aba08fa3f240b51ae (commit)
via a10e21e3e6564cb1c4b7c4ba414854f06c390d5d (commit)
via 783d5ea02e677fe00e8b3f7ad43d801a9a87de38 (commit)
via 047c31b4246bb5eb0f20238355190f9535dc4721 (commit)
via f75437546fcfbbd931e9577dc428f9c52ed13beb (commit)
via 896794bd35914c82fce4922d4e937d7f6057e87d (commit)
via e49b5f0cd2c5ad8efd8ec206f0c17712dd14a567 (commit)
from 8fa2cc8585eb7077eb8286b5a1b66cd3cd93475e (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 1d2a92b485a6053af84bb7e7820b5aaa15860580
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Jan 13 16:10:20 2017 +0100
Bug 17899 - Show only mine does not work in newordersuggestion.pl
Bug 12775 added a link "Show only mine" in newordersuggestion.pl.
This does not work, no results.
Also corrects the fact that click must not do default action by adding e.preventDefault().
Test plan :
- You must have suggestions you have accepted
- Create a new order from suggestion : /cgi-bin/koha/acqui/newordersuggestion.pl
- Click on Show only mine
=> Without patch the table is empty showing "No matching records found"
=> With patch you see only suggestions you have accpeted
Signed-off-by: Zoe Schoeler <crazy.mental.onion at gmail.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 1104e61635e2d567c89587c28fd9a24b4f262037)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit fd8ef06f0e2eeeb4d23d334127e9295f91b0462a
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Jan 17 06:42:11 2017 +0000
Bug 17920: t/db_dependent/Sitemapper.t fails because of permissions
The directory it attempts to create an xml file may not be writable for
the user running the test. By changing the directory from the current
directory to a temporary one, the test runs. After all 'chmod 777
t/db_dependent' is a bad idea.
TEST PLAN
---------
1) sudo koha-shell "prove t/db_dependent/Sitemapper.t" kohadev
-- fails
2) apply patch
3) sudo koha-shell "prove t/db_dependent/Sitemapper.t" kohadev
-- succeeds
4) run koha qa test tools
Tested without qa tools
Signed-off-by: Claire Gravely <claire_gravely at hotmail.com>
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 7401d9422be26c5ff900269a10e70c9ca4364de6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5a9f79c1bd3b1e35bbe80d98eef6d1e51354479f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 23 09:18:03 2016 +0000
Bug 17808: Fix behavior when editing a circ rule
The original behavior is broken, see https://stackoverflow.com/questions/21410484/jquery-selector-to-find-out-count-of-non-empty-inputs
Test plan:
Edit a circ rule
=> Without this patch you get a useless message
=> With this patch, no message
Edit a circ rule with content in inputs
=> With or without this patch you get a useful message
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 5a9ffa92cecf69ec44450da9676cfbdb0f7d9fa1)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1d28489f76a6890b38009e5f5b92ccd1d18051bc
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Jan 20 12:16:44 2017 +0100
Bug 17909: QA followup: remove unused var and move global var
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit db708b9f37378656621e4d73e8a36c146730db5e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 20 11:29:30 2017 +0100
Bug 17909: [Follow-up] Quick fix for UNIMARC
UNIMARC inserts field 100. This interferes the field count and order
in the test.
Note: This is a quick fix. Will polish it after bug 17913.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit f61451ff0ff5ca4bde8f5e1425caf37b501fb8ba
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Jan 16 13:03:21 2017 +0000
Bug 17909: Followup - fix typos
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
EDIT:
Adjusted three small typos that did not disturb the test in its current
form, but do when we are fixing bugs on bug 17913.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit cac98af1f40c753d094b4f1b69a638455c31d26f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jan 16 12:15:56 2017 +0100
Bug 17909: Additional polishing
No spectacular things:
[1] Move the framework modifications to a sub. Use same style to create auth types and linked fields.
[2] Change some new Object occurrences to Object->new.
[3] Add tests for field count and field order in the first two subsets.
[4] Few whitespace changes (sorry) and comment lines.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 1d8d9161fa0f917e7e974d0fe76ca400e7119658
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jan 4 11:15:51 2017 +0100
Bug 17909: Add tests for merging with another authtype
Originally aimed for bug 9988. Adjusted in line with other subtests.
Will polish the three subtests a little more on a follow-up.
Test plan:
Run t/db_dependent/Authorities/Merge.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 7859ea37b2bc2c9ae36b2e2f2907cade573ccaae
Author: mbeaulieu <mbeaulieu at inlibro.com>
Date: Mon Aug 18 10:04:55 2014 -0400
Bug 17909: Adding tests from bug 11315
Based on original patch from Maxime Beaulieu on bug 11315.
Amended by Marcel de Rooy on report 17909.
EDIT:
Original tests have been adjusted in view of:
[1] Test on bug 11315 heavily leaned on DBD::Mock. Since we are
using Test::DBIx::Class on such tests now, this would need attention.
Moreover, the advantage of mocking the database in this case is at
least arguable.
[2] Matching the first (somewhat older) subtest of 11700.
[3] Simplification and readability.
Look e.g. at the use of $MARCto and $MARCfrom on 11315.
This made me merge them in the db_dependent counterpart.
Also note that this subtest adds another needed test case: the merge from
auth1 to modified auth1, while 11700 tested auth1 to auth2.
Test plan:
Just run t/db_dependent/Authorities/Merge.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 1fb7d9a869987b0e8de6cd7316ee78741a69c65f
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Feb 19 11:31:13 2014 +0100
Bug 17909: Add unit tests for C4::AuthoritiesMarc::merge
Original patch from Julian Maurice on bug 11700.
With sign offs by:
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Amended by Marcel de Rooy on report 17909.
EDIT (January 2017):
Removed some tests not related to merge.
Put remaining tests in a subtest, made them working on current merge.
Slightly revised the mocking.
Note: I plan to move the zebra retrieval stuff outside merge in one of
the next stages, and replace it by calling Koha::SearchEngine. This will
reduce mocking complexity here.
Test plan:
Just run t/db_dependent/Authorities/Merge.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit e8230c189da00b3b68c04c354ecb7cc6cacb4ad8
Author: David Cook <dcook at prosentient.com.au>
Date: Wed Jan 25 09:58:40 2017 +1100
Bug 17986 - Perl dependency evaluation incorrect
It looks like I made a copy/paste error in a previous patch.
While the fix was working when you pass the param "module" to
version_info, it wasn't populating the version correctly
for the "all" param, which causes koha_perl_deps.pl to
think all OK modules actually need an upgrade.
TEST PLAN
0) Be on a system where you know your Koha Perl dependencies are
mostly up-to-date
1) Run ./koha_perl_deps.pl -a -c
2) Note that most modules say they need an upgrade even when
the installed version is the same as the minimum version
3) Apply patch
4) Run ./koha_perl_deps.pl -a -c
5) Note that most moduls say they're OK, especially when the
installed version is the same or greater than the minimum version
https://bugs.koha-community.org/show_bug.cgi?id=17880
https://bugs.koha-community.org/show_bug.cgi?id=17986
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 8ecc75fb2498a55c98aad7743d8cb38ac5843f17
Author: David Cook <dcook at prosentient.com.au>
Date: Thu Jan 12 11:15:22 2017 +1100
Bug 17880 - Use version.pm to parse version numbers in C4::Installer::PerlModules
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 b732963e2f91a54894f12cd5fd964c21e1c6f533)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2942adf41545b0e025f343ce60c2dfae9aa6a7c0
Author: David Cook <dcook at prosentient.com.au>
Date: Thu Jan 12 11:14:34 2017 +1100
Bug 17880 - Add test to check version number comparison
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 2321ae0d796fa6b13cde8f321b6c697cc48a5437)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 34b296cc3b9e06d2a235239b2bff79f06c12c26f
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Jan 19 00:38:52 2017 +0000
Bug 17917: [AMENDED] Fix path issue in t/db_dependent/check_sysprefs.t
EDIT (from Marcel):
Previous patch fixes issue caused by Search.t.
This patch still adds some small changes to check_sysprefs.t.
Signed-off-by: Grace McKenzie <grace.mcky at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit b4b66d6094fc5d806198844e5874896849899d14
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 20 10:11:47 2017 +0100
Bug 17917: [QA Follow-up] Reprove Search.t
The config tweaks from Search.t break check_sysprefs.t later on.
Clearing the cache resolves that.
Test plan:
[1] Run prove t/db_dependent/Search.t t/db_dependent/check_sysprefs.t (in
one statement) before and after applying this patch.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
A prove t/db_dependent did not fail check_sysprefs.t (only skipping two
tests: 00-strict.t and Koha/IssuingRules.t; not enough patience)
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 5c1ac983417fe5f6bb2b04c535638aed07d19502
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu Jan 19 15:22:05 2017 +0000
Bug 17615 - Fix unit tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 34568bac9fb3a35d44191cacfcfa36beb7ae0a1a
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Wed Nov 16 10:37:48 2016 +0000
Bug 17615 - Fix updating borrower attributes in checkpw_ldap
Signed-off-by: Oliver Bock <oliver.bock at aei.mpg.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 2f64ed22a6c54f5515c7d10fb3a9f55ac5853785
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Oct 20 00:10:52 2016 +0200
Bug 17469: Add missing sample notices fr-CA test
Add fr-CA installer to xt/sample_letter.t
To test:
- Verify xt/sample_letter.t test checks fr-CA now and
fails for just fr-CA.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.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 3c09fefb1dd3c8728404ef641f95885e61a674f4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 406e52b1927bd343f1fa2ecadddd0af94d75bf17
Author: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
Date: Tue Jan 17 22:41:52 2017 +0000
Bug 15460 Adding spaces after subfields c and h of 245
Test Plan
1: Add something inside c and h of 245 on a Bibliographic Record. There won't be a space between
the c and h
2: This will occur on both the search results and the details pages of
the record in both the intranet and opac.
3: Apply the patch
4: Refresh and see that there is now a space between c and h.
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 8fcfdf6853267d81f644e8f32f647dc192f5ab86)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5938fdddd91cf6fa83ffa42df796927237dfdc2f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Dec 8 12:28:53 2016 +0100
Bug 17931: Remove unused vars from reserves_stats
Change to Modern::Perl.
Remove null_to_zzempty and add a few blank lines between subs.
Remove unused vars: $podsp, $type, $daysel, $monthsel and $mime.
Removing trailing 1;
Test plan:
Run a few reports from reports/reserves_stats.pl
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Emma Smith <emma.nakamura.smith at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Wrongly pasted from reports/issues_stats.pl initially
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 639489f48f5285ec7990a01b8e991719edf45af4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit bb5a88a3de811f4573a09a41571424e8c99e3ad5
Author: Magnus Enger <magnus at libriotech.no>
Date: Tue Jan 17 14:50:49 2017 +0000
Bug 17924 - Fix error in password recovery
To test:
- Set OpacResetPassword = allowed
- Make sure you have a user with a username and email
- Go to the OPAC and make sure you are not logged in
- Click on the "Forgot your password?" link
- Fill in "Login" and "Email" and click on "Submit"
- You will get an error that says:
Undefined subroutine &C4::Letters::GetPreparedLetter called at
/home/vagrant/kohaclone/Koha/Patron/Password/Recovery.pm line 142.
- Apply the patch
- The steps above will have added your user to the borrower_password_recovery
table in the database. Delete it from there to make sure you start a
fresh reset request.
- Repeat the steps above and notice that the error is gone. You should
get a nice message instead that says "An email has been sent to [your
email]".
- Sign off
Signed-off-by: Zoe Schoeler <crazy.mental.onion at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b43b79156f179094ed16a896f0bf0b3d39b4af7d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 6b9cfe68d020ba82e05531e3c799714b5ef7e8a1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Dec 14 16:48:45 2016 +0100
Bug 17777: koha-remove should deal with temporary uploads
If the temporary upload folder exists, it should be discarded when
removing an instance. If we do not, it may/will create problems when
recreating the same instance.
A function in koha-functions.sh is added to determine the temp directory
instead of hardcoding /tmp.
Test plan:
[1] Copy koha-functions.sh to /usr/share/koha/bin
[2] Run koha-create --create-db newinstancexx
[3] Run mkdir /tmp/koha_newinstancexx_upload (if /tmp is your temp!)
[4] Run debian/scripts/koha-remove newinstancexx
Do not run the regular one, but verify that you use the updated one.
[5] Check that /tmp/koha_newinstancexx_upload is gone.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Karen Jen <karenliang.student at wegc.school.nz>
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 2c40579077b67d4203665b7e6ecdb749235456a4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c0112d9907f36e0900f572c07a1001417196565a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 16 11:51:01 2017 +0100
Bug 17914: Do not try and add the updated_on columns to the borrowers and deletedborrowers table
Bug 10459 has been backported and the DB entry (add borrowers.updated_on and
deletedborrower.updated_on) is now played in
- 16.06.00.027
- 16.05.00.002
- 3.22.08.001
This will raise a MySQL warning if the column already exists.
DBD::mysql::db do failed: Duplicate column name 'updated_on'
Since bug 17234 we have now a subroutine (C4::Installer::column_exists) to test
if a column exists.
When a DB entry modifying the DB structure is backported, it HAS TO check if the
column, constraint or table exists before executing the query.
Test plan:
git checkout 3.22.x (16.05.x or 16.11.x)
install Koha
git checkout master
execute the installer
=> Without this patch you will get a warning when adding borrowers.updated_on)
=> With this patch, you should not get it
Signed-off-by: Mark Tompsett <mtompset 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 2b303129b82a5134f04c24907c05bf863603fef7)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ed038fa7de708f43c5fb55f47f0be0558d272a6d
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Jan 10 22:20:40 2017 +0000
Bug 17879: Use image filename if no image name is entered
This patch changes the code to use the filename of the uploaded image if
no specific image name is entered.
To test:
1) Go to Tools -> Patron card creator -> Manage images
2) Upload an image and leave the image name field empty
3) Notice this works and 'Name' is left empty.
4) Apply patch and refresh page
5) Upload an image and leave the image name field empty
6) Notice the image name is given the filename so that 'Name' is no
longer empty.
Sponsored-by: Catalyst IT
Signed-off-by: Claire Gravely <claire_gravely 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 d3752c85dc2f5af974ec2fe4585efa8510302968)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1e3214b676d91583af530336b64cbe682520892b
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Dec 21 02:27:46 2016 +0000
Bug 17794: Menu items in Tools menu and Admin menu not showing bold when active but not on linked page
To reproduce:
admin-menu
1) Go to a page like admin/categories.pl
2) Click New Category
3) Notice Patron categories in the sidebar menu is no longer bold
tools-menu
4) Go to a page like reviews/reviewswaiting.pl
5) Notice bold Comments in sidebar menu
6) Click Approved Comments tab
7) Notice no longer bold in sidebar menu
To test:
8) Apply patch and refresh page
9) Follow above steps to reproduce bug, confirm that active links are
always bold
10) Test with other links to confirm nothing has broken
Special cases
11) Go To admin -> MARC bibliographic frameworks -> Actions for any
framework -> MARC structure
12) Confirm sidebar menu link is still bold
13) Go to admin -> Authority types -> Actions for any auth type -> MARC
structure
14) Confirm sidebar menu link is still bold
15) Click Actions for any tag -> Subfields
16) Confirm sidebar menu link is still bold
17) Go to admin -> OAI sets config -> Actions for any set -> Define
mappings
18) Confirm sidebar menu link is still bold
Sponsored-by: Catalyst IT
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.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 bee87e4f61d6f515bee20ab1792b4ca76605c0e9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f906e2f8608d29972d627d04eb5ccaac251d378c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 10 15:52:57 2017 +0100
Bug 17778: Simplify fetch date
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 c69e6faa983fa87412927f6f0a640d5eb07d0f93)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 6290c58a588192cade869e3a972a3dd3ff2dfb62
Author: Magnus Enger <magnus at libriotech.no>
Date: Fri Jan 6 15:27:04 2017 +0100
Bug 17778 - Make "Earliest Registered Date" in OAI dynamic
This was hardcoded to 0001-01-01.
To test:
- Make sure you have a couple of records, with different timestamps
- Enable OAI-PMH
- Check http://localhost:2201/cgi-bin/koha/oai.pl?verb=Identify
and verify that "Earliest Registered Date" is 0001-01-01
- Apply the patch
- Re-check the "Earliest Registered Date" and verify that it is now
the lowest timestamp in your biblio table
- Manipulate the timestamps and verify that "Earliest Registered Date"
changes accordingly
- Sign off!
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 ff711c48cfa02c7b6ab09fe22f699a872420db8d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit fee86bed56493ad8b55e139c28a0e95f26f4573e
Author: Magnus Enger <magnus at libriotech.no>
Date: Thu Sep 8 14:13:46 2016 +0200
Bug 17265 - Make koha-create-defaults less greedy
koha-create-defaults substitutes the instance name with the placeholder
__KOHASITE__ in the SQL file that it creates. If the instance name is
something common, like "data", this means that way too many substitutions
will be made, and when koha-create uses the SQL file as a template, broken
data can be the result.
The solution in this patch was suggested by drojf on IRC.
To test:
- Create an instance called "data"
- Run "sudo koha-dump-defaults data > test.sql"
- Take a look at test.sql and verify there are way too many occurences
of __KOHASITE__, like "-- Dumping __KOHASITE__ for table `accountlines`"
- Apply the patch
- Copy the resulting koha-create and koha-dump-defaults to somewhere
running off the packages
- Run "sudo koha-dump-defaults data > test.sql" again and verify there
are only 4 occurrences of __KOHASITE__, in places that make sense
- Create an instance with something like:
$ gzip test.sql
$ sudo koha-create --create-db --defaultsql test.sql.gz test17265
- Verify that you have a working Koha install
Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>
Works as expected.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ae8223e333201d264b19bf6ed9e91c10c94349ad)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit fad74240bc0b97b96a2b25f19b1e7c67896c884e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jan 12 10:44:46 2017 +0100
Bug 17234: Need to separate KEY and FOREIGN KEY checks
In the previous patch we use the constraint_exists subroutine to verify
if an index or a foreign key exists.
But the `SHOW INDEX` query does not return foreign keys (as its name
suggests!).
We need another subroutine foreign_key_exists to check the FK existence.
I have found that because t/db_dependent/TestBuilder.t fails on
oai_sets_biblios, because oai_sets_biblios_ibfk_1 has not been removed.
Test plan:
0/ Do not apply this patch
1/ Use a 3.20 DB
2/ update the DB
3/ SHOW CREATE TABLE oai_sets_biblios
will display oai_sets_biblios_ibfk_1
Apply the patch and repeat 1, 2, 3
=> Will not display oai_sets_biblios_ibfk_1
It has been removed as expected.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 05fdd855c8da85d3be27d42721f6a544b0145e57)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f0303d7a75d7cc9f383322a01fee86e485a9f007
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 2 11:36:53 2017 +0100
Bug 17234: Test the column and constraint non-existence
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 435b7badc22d9c05cb16623d6f423206992ec476)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 61a585d81c819d0346c211b6ff7dc59a06eb35ec
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Dec 30 14:08:33 2016 -0500
Bug 17234: Two new functions lack tests
This adds two tests to t/db_dependent/Installer.t
TEST PLAN
---------
1) Apply patch
2) prove -v t/db_dependent/Installer.t
-- column and constraint tests were added.
3) run koha qa test tools
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 8938631f38bb22456424219d3c3453493df6f848)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e79cca60a0c8083b0ec5b661a1e992f29c8cb9ae
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 27 08:28:09 2016 +0100
Bug 17234: Move new subroutines to C4::Installer
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 0b15c5e2cc5d5a84b062c5c5738fe54ab5df98ab)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 364e53f739b65e2effcce2604edf97395176d01e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 20 16:55:40 2016 +0100
Bug 17234: Add constraint_exists and column_exists to updatedatabase.pl
These 2 subroutines will help us deal with the absense of ALTER IGNORE
TABLE
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit c08922180e83b0222dc3d54a292aaf49cc15000a)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Conflicts:
installer/data/mysql/updatedatabase.pl
commit dc1f045245bb5b582b2be96ad8b9761dba842eb5
Author: Blou <philippe.blouin at inlibro.com>
Date: Fri Sep 2 08:05:48 2016 -0400
Bug 17234 - updatedatabase.pl's ALTER IGNORE break with mysql 5.7.4+
The doc says: "As of MySQL 5.7.4, the IGNORE clause for ALTER TABLE is removed and its use produces an error."
This fix replaces ALTER IGNORE with ALTER in updatedatabase.pl
To TEST, try an upgrade from 3.18 to 3.22 after installing the latest mysql (at least 5.7.4, by the doc).
Some will fail with error
DBD::mysql::db do failed: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IGNORE TABLE aqbasket
ADD KEY authorisedby (authorisedby)' at line 1 [for Statement "
ALTER IGNORE TABLE aqbasket
ADD KEY authorisedby (authorisedby)
"] at ./installer/data/mysql/updatedatabase.pl line 10563.
0) Find a database on 3.18, save it.
1) Set your code base to 3.22(or master)
2) run updatedatabase.pl
3) See the errors.
4) Apply the patch
5) Reload the 3.18 database
6) succeed with updatedatabase.pl
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit acf425bbbcb8c22f3655472f90285869c3ad7164)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 8bf19af1d097b1df6936bca1500a169bf78200b1
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: Mason James <mtj at kohaaloha.com>
commit 8c2104062eaa6ea01c621cc31eeb146759008e2d
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: Mason James <mtj at kohaaloha.com>
commit 9077d5a172149c92485bb3b89778c6493a7d8f44
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: Mason James <mtj at kohaaloha.com>
commit 1c0abdf23eca26ecadfd09af33b831867a8b983d
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: Mason James <mtj at kohaaloha.com>
commit bdc2efff620b09f8ab2c4b4aba08fa3f240b51ae
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: Mason James <mtj at kohaaloha.com>
commit a10e21e3e6564cb1c4b7c4ba414854f06c390d5d
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: Mason James <mtj at kohaaloha.com>
commit 783d5ea02e677fe00e8b3f7ad43d801a9a87de38
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>
Conflicts:
t/db_dependent/Koha/Patron/Categories.t
commit 047c31b4246bb5eb0f20238355190f9535dc4721
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: Mason James <mtj at kohaaloha.com>
commit f75437546fcfbbd931e9577dc428f9c52ed13beb
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: Mason James <mtj at kohaaloha.com>
commit 896794bd35914c82fce4922d4e937d7f6057e87d
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: Mason James <mtj at kohaaloha.com>
commit e49b5f0cd2c5ad8efd8ec206f0c17712dd14a567
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: Mason James <mtj at kohaaloha.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth_with_ldap.pm | 2 +-
C4/Circulation.pm | 22 +-
C4/Installer.pm | 37 +++
C4/Installer/PerlModules.pm | 8 +-
Koha/OAI/Server/Identify.pm | 10 +-
Koha/Patron/Category.pm | 35 +++
Koha/Patron/Password/Recovery.pm | 1 +
debian/scripts/koha-create | 2 +-
debian/scripts/koha-dump-defaults | 2 +-
debian/scripts/koha-functions.sh | 20 ++
debian/scripts/koha-remove | 6 +
installer/data/mysql/updatedatabase.pl | 208 ++++++++------
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 13 +-
.../intranet-tmpl/prog/en/includes/tools-menu.inc | 7 +-
.../prog/en/modules/acqui/newordersuggestion.tt | 8 +-
.../prog/en/modules/admin/smart-rules.tt | 2 +-
.../prog/en/modules/help/circ/circulation-home.tt | 1 +
.../prog/en/modules/patroncards/image-manage.tt | 19 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 4 +-
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 4 +-
koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 2 +-
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 4 +-
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 4 +-
koha-tmpl/opac-tmpl/xslt/OAI.xslt | 28 +-
patroncards/image-manage.pl | 2 +-
reports/reserves_stats.pl | 18 +-
t/Installer_PerlModules.t | 14 +-
t/db_dependent/Auth_with_ldap.t | 33 ++-
t/db_dependent/Authorities/Merge.t | 288 ++++++++++++++++++++
t/db_dependent/Circulation/issue.t | 26 +-
t/db_dependent/Installer.t | 73 ++++-
t/db_dependent/Koha/Patron/Categories.t | 12 +-
t/db_dependent/Patrons.t | 29 +-
t/db_dependent/Search.t | 3 +
t/db_dependent/Sitemapper.t | 2 +-
t/db_dependent/check_sysprefs.t | 11 +-
xt/sample_notices.t | 1 +
37 files changed, 758 insertions(+), 203 deletions(-)
create mode 100755 t/db_dependent/Authorities/Merge.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list