[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-82-g2e2d4b2
Git repo owner
gitmaster at git.koha-community.org
Fri Aug 10 10:35:27 CEST 2018
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, 18.05.x has been updated
via 2e2d4b26a43e54d7e97a4da03cc294486d7c7922 (commit)
via 74a2565c99dc92e390950c7ce340202efba2161c (commit)
via 9a6ed1c852c00644349597e59a369bef5a19d9a1 (commit)
via 34f3d77cccdb8c06ed5946139154219495f8d4ed (commit)
via 6e269676998a5346f279634e64c90d68e4c81259 (commit)
via 114b738466e1a1ab3ee9741b86a02c5560c69ed2 (commit)
via aa2a0be3f7ecdb4d03441b2283cc86bb7987265d (commit)
via 4fd18a7df711f5a59f459234ec186b175ee05eb6 (commit)
via 1dfa4318262a908b1df9d8d2454c15a39c84416c (commit)
via fe9888e1ab5aa67c4b52efb1dbca5290e9c3dfd7 (commit)
via 88a2c8886c4cf37e6dff00cffd26674d6ac548e2 (commit)
via 0a5dabc27174d5b77783f81c59248f5da8b37c79 (commit)
via 54d960cb86b91bb21cc7c92e1feef9970faaf8a1 (commit)
via 9bb74effa31053c685902df48714a61c18d3c6d9 (commit)
from b3b976f189fc455f8f0ac553c99d6efb859d747f (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 2e2d4b26a43e54d7e97a4da03cc294486d7c7922
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu May 18 21:07:11 2017 -0400
Bug 18635: Unit tests
I also adjust a few tests that assume value of $nb_of_patrons to not
rely on existing datas
To test:
1 - Apply this patch only
2 - Prove t/db_dependent/Koha/Patrons.t
3 - Tests fail
4 - Apply other patch
5 - Tests pass
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit ac0f3b880a4220317ddde107c508c32f75b09aa1)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 74a2565c99dc92e390950c7ce340202efba2161c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu May 18 21:08:22 2017 -0400
Bug 18635: Koha::Patron->guarantees() should return results alphabetically
To test:
1 - Add the same guarantor to a number of patrons, ensuring random order
alphabetically
2 - View the guarantors record, note unordered list of guarantees
3 - Apply patch
4 - Guarantees are alphabetical
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit fe6cb85c5580b582a0047769d88be23757df0ef5)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9a6ed1c852c00644349597e59a369bef5a19d9a1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Jul 3 15:52:05 2018 +0200
Bug 21033: Remove few warns in acqui/basket.pl
Resolve (line numbers based on 16.11.x):
Use of uninitialized value in hash element at acqui/basket.pl line 337.
Use of uninitialized value in hash element at acqui/basket.pl line 338.
Use of uninitialized value in hash element at acqui/basket.pl line 340.
Use of uninitialized value in hash element at acqui/basket.pl line 342.
Use of uninitialized value in hash element at acqui/basket.pl line 344.
Argument "" isn't numeric in multiplication (*) at koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt line 486.
Argument "" isn't numeric in multiplication (*) at koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt line 591.
Test plan:
If you have older acq data, you may have records in aqorders with field
tax_rate_on_ordering is NULL. These orders will trigger the above warns.
If you do not have, you could simulate by setting this field to NULL.
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: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit af82a1d59709d02b767613539146b59fa10c3ab3)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 34f3d77cccdb8c06ed5946139154219495f8d4ed
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jul 19 15:13:55 2018 +0000
Bug 20828: Step 4 of moremember is used for Housebound and additional attributes
This patch modifies the patron edit process so that "Housebound roles"
can be edited as a separate step.
To test, apply the patch and open an existing patron's detail page
(moremember.tt). Test the "edit" links for 'Housebound roles' and
'Additional attributes and identifiers' and confirm that each opens its
own edit page, and saving changes works correctly.
Signed-off-by: Cab Vinton <bibliwho at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 9d4c7350612dfb941a84a0e62ffe3efe19ccc4f8)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6e269676998a5346f279634e64c90d68e4c81259
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Aug 9 13:28:27 2018 +0000
Bug 21188: Convert return_date to a DateTime object
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d035a140b51be6f2dad8f5f760ac0e626f952be5)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 114b738466e1a1ab3ee9741b86a02c5560c69ed2
Author: David Bourgault <dav.bour at gmail.com>
Date: Tue May 1 14:03:52 2018 -0400
Bug 20660: Return date override affects debarments in AddReturn
Re-did the patch to follow best practices.
TEST PLAN:
0. Apply first patch only
1. prove t/db_dependent/Circulation.t
2. Apply second patch
3. prove t/db_dependent/Circulation.t
prove should fail the first time and pass the second time.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit bf9527457fb31012b65514a36f8f4001157771b4)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit aa2a0be3f7ecdb4d03441b2283cc86bb7987265d
Author: David Bourgault <dav.bour at gmail.com>
Date: Tue May 1 14:01:50 2018 -0400
Bug 20660: Test AddReturn with $return_date override
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 8d9eb9734f2584c7b5f92689ecbd9a3adba173fd)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4fd18a7df711f5a59f459234ec186b175ee05eb6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 4 15:05:25 2018 -0300
Bug 21035: Handle new lines when running reports
See https://metacpan.org/pod/Text::CSV_XS#Embedded-newlines
Test plan:
1) Choose two items, say barcode '123' and '456'
2) Change the public note on 123 to read
Line1
Line2
(I.e. type 'Line1', then press Enter, type 'Line2' and click update).
3) Change the public note on 456 to read
Public note has one and only one line.
Click update.
4) Create a report with the followng query:
select barcode, itemnotes from items where barcode in ( '123', '456' )
Let's say that this is report number 10.
5) run ./misc/cronjobs/runreport.pl --format=csv REPORT_ID:
=> You should see both lines
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and it works.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f16fb888f132703063f0591e329d72d065f4b1d9)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1dfa4318262a908b1df9d8d2454c15a39c84416c
Author: David Cook <dcook at prosentient.com.au>
Date: Mon Jul 30 14:35:40 2018 +1000
Bug 21131: Remove the TinyMCE.isDirty() check that caused unexpected behaviour
When using the WYSIWYG editor for system preferences, the editor only
updates the textarea element if the content is different from the
original content. This means if you change a system preference and
then change it back to the original content, the textarea will have
the 2nd last change you made.
This patch removes the TinyMCE.isDirty() check, which was responsible
for comparing the original and changed content. Every input/keydown/dragend
or TinyMCE command will cause the textarea element to be updated and
trigger the input event which causes the "modified" class to be added
to the element, so that the system preference can be saved.
__TEST PLAN__
_Before applying_
0. Change "UseWYSIWYGinSystemPreferences" to "Show"
1. Change "opaccredits" to "123a"
2. Click "Save all OPAC preferences"
3. Reload the page
4. Change "opaccredits" to "123"
5. Change "opaccredits" to "123a"
6. Click "Save all OPAC preferences"
7. Reload the page
8. Note that "opaccredits" says "123"
_Apply the patch_
_After applying_
1. Change "opaccredits" to "123a"
2. Change "opaccredits" to "123"
3. Click "Save all OPAC preferences"
4. Reload the page
5. Note that "opaccredits" says "123" (and not "123a")
6. Change "opaccredits" to "1234"
7. Click "Save all OPAC preferences"
8. Reload the page
9. Note that "opaccredits" says "1234"
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f4cf075fbea353a5cbf11aaead37c92eac8179b2)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fe9888e1ab5aa67c4b52efb1dbca5290e9c3dfd7
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jul 27 17:22:54 2018 +0000
Bug 19291: Make breadcrumbs for OPAC search history consistent with other patron account pages
This patch adds the logged-in patron's name to the search history page's
breadcrumb navigation.
To test, apply the patch and view the OPAC search history page with no
user logged in. The breadcrumbs should read:
- Home -> Search history
Log in and return to the search history page. The breadcrumbs should
read:
- Home -> Owen Leonard -> Your search history
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and it works.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
https://bugs.koha-community.org/show_bug.cgi?id=21137
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit ff3987c023a658e63e46ea8601666916287c8ec5)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 88a2c8886c4cf37e6dff00cffd26674d6ac548e2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 31 12:14:54 2018 -0300
Bug 21056: Add another flush later
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5abcd3312adc02a14465a0781f735b8494d60f42)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0a5dabc27174d5b77783f81c59248f5da8b37c79
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jul 9 14:05:29 2018 -0400
Bug 21056: Changing the logged in library can fail sporadically
We are getting reports that sometimes changing the logged in library via selectbranchprinter.pl sometimes appears to fail. Flushing the session after updating the branch appears to fix this.
Test Plan:
1) Change your logged in library repeatedly. Hopefully ( sort of ) it will fail to change.
You may want to try various browsers.
2) Apply this patch
3) Note the change no longer fails
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 76a06a7050643add32f4cbccbdc2fb00f66f5485)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 54d960cb86b91bb21cc7c92e1feef9970faaf8a1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 6 15:26:49 2018 -0300
Bug 21141: Handle non-existent itemnumbers in batch item modification/deletion
The itemnumber list passed from a file in the batch item
modification/deletion tools is not tested.
Like barcodes we should make sure they refer to a valid items in the DB.
Test plan:
- Create a file with barcodes, itemnumbers and random lines
- Use the batch item modification and deletion tools with this file
You should see a table with a list of invalid barcodes and itemnumbers.
Without this patch you got the following error:
Can't call method "title" on an undefined value at
/home/vagrant/kohaclone/tools/batchMod.pl line 580
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit e8e29d3140007b9b92d97ed2f1df7445c6eeb4f9)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9bb74effa31053c685902df48714a61c18d3c6d9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 2 13:46:31 2018 +0000
Bug 21148: Dropdowns styled by the Select2 plugin do not highlight missing required fields
This patch adds some CSS to target mandatory fields on the add item
screen which are styled by the Select2 plugin.
To test you must have at least one item field marked mandatory and
linked to an authorized value.
Open the add item form for an existing record. Try to submit the form
without making a selection in the mandatory dropdown. You should get an
alert warning you that you have empty mandatory fields, and the field
should be highlighted in yellow.
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: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 62aacb5865719e27224bf8f1963de1888d2ca05d)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 1 +
Koha/Patron.pm | 2 +-
acqui/basket.pl | 4 +-
circ/selectbranchprinter.pl | 2 +
koha-tmpl/intranet-tmpl/prog/css/select2.css | 4 ++
.../prog/en/includes/wysiwyg-systempreferences.inc | 8 +--
.../prog/en/modules/members/memberentrygen.tt | 7 ++-
.../prog/en/modules/members/moremember.tt | 2 +-
.../prog/en/modules/tools/batchMod-del.tt | 50 ++++++++++++-----
.../prog/en/modules/tools/batchMod-edit.tt | 54 ++++++++++++------
.../bootstrap/en/modules/opac-search-history.tt | 1 +
members/memberentry.pl | 8 +--
misc/cronjobs/runreport.pl | 1 +
t/db_dependent/Circulation.t | 15 ++++-
t/db_dependent/Koha/Patrons.t | 58 ++++++++++++++++++--
tools/batchMod.pl | 16 +++---
16 files changed, 172 insertions(+), 61 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list