[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.09-43-g2aeacaa
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 21 15:18:08 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, 17.11.x has been updated
via 2aeacaa96ee71cbd77fdfd372206ead7bce0c589 (commit)
via 70284a33e41c1b9c86b5454e49c44e276c2d2e7d (commit)
via f45a8fa715db375b2c0e547bfda79c3e751caa92 (commit)
via 055127e9e8d5beecefa9025aaa8a4d37d1fddf86 (commit)
via a28cc6108b2a83a8d1dbdaf4f5ee2a4fbddfe931 (commit)
via 5c34ec56648ea66c4047a078405bf04695d0945a (commit)
via 784b7d7af2be71e7feae2cea5b754ab4f3abf646 (commit)
via 3f24a07a7ee83859aed10a0d874438a6c6fad2a2 (commit)
via fc0841f55432464c6e73eb485b2babd0f7598133 (commit)
via 68828e1a5351a2f2f9cbf8e9d98544b2647af447 (commit)
via 0afb31f6190edfa55c55acfb38cd89a17acc1ee7 (commit)
from a981f630dd1c1a4e9a0ef80291556f89fdb1b1a0 (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 2aeacaa96ee71cbd77fdfd372206ead7bce0c589
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 15 12:21:38 2018 -0300
Bug 21230: Prevent Reserves.t to fail randomly
The following test can fail if the hold has been generated with found => 'W':
# Failed test 'No tests run for subtest "_koha_notify_reserve() tests"'
# at t/db_dependent/Reserves.t line 675.
Can't call method "to_address" on an undefined value at
t/db_dependent/Reserves.t line 661.
# Looks like your test exited with 255 just after 56.
We should call AddReserve instead.
Test plan:
0. Do not apply this patch
1. Do the following change:
my $hold = $builder->build({
source => 'Reserve',
value => {
borrowernumber=>$hold_borrower,
found => 'W', # This line is added, do not forget the comma above
}
});
2. Prove it makes the test fail
3. stash the changes and apply this patch
4. Make sure the tests pass
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit c957b52ef8bba734043157445470bedc36feae5e)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit c359d56f25a0b346b71a3fd8700b07e4713640d7)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 70284a33e41c1b9c86b5454e49c44e276c2d2e7d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 11:22:14 2018 -0300
Bug 20795: Inform the user about this change, add to pod
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 e97f6ab9be6108cbe4d61ea8dd4b876527bd67ba)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 40bfb7913da164f03ff44956218a8e314f87aeba)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit f45a8fa715db375b2c0e547bfda79c3e751caa92
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sun May 20 14:44:45 2018 +0000
Bug 20795: Pass incrreased verbosity to zebra rebuild script
To test:
1 - Run koha-rebuild-zebra with multiple '-v'
2 - Note no increased verbosity
3 - Apply patch
4 - Run the updated koha-rebuild-zebra script with multiple '-v'
5 - Note increased verbosity
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 1dfb177d3fff713185bcb0aa86517ef40629fedc)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit dbdd2b56303be0fab287d861dbd9007bf554f9d8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 055127e9e8d5beecefa9025aaa8a4d37d1fddf86
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 6 18:15:10 2018 +0000
Bug 21164: Fix alignment on new basket form in acquisitions
This patch removes some unnecessary " "'s from the template for
creating a new basket in acquisitions. This fixes the alignment on the
form fields.
To test, apply the patch and go to Acquisitions -> Vendor -> New basket.
All the form fields should be correctly left-aligned with each other.
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.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 2280877fdd9685aecff0b144319ca3bffc39b78a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 5fe28bf39877440025e2a7ee1b2db1054be47852)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit a28cc6108b2a83a8d1dbdaf4f5ee2a4fbddfe931
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Aug 8 16:45:28 2018 +0000
Bug 21185: Incorrect title tag on tags review page
This patch corrects the title tag on the tags review page.
To test, apply the patch and go to Tools -> Tags. The page title
(probably shown in the browser tab) should start with "Koha ->" instead
of "Home ->".
Signed-off-by: Maryse Simard <maryse.simard at inlibro.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 ad0f90b797c77b853ff61501310892282f582988)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 718af573c158412e1dc24308d2e1129b70cef861)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 5c34ec56648ea66c4047a078405bf04695d0945a
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Aug 10 17:18:39 2018 +0000
Bug 19390: Make jQuery selector more specific, so OPAC view link can open in new tab
The OPAC view link in the staff result list already had a target="_blank",
but it didn't work, because of the JavaScript for the result list browser
in staff.
The JavaSript code was looking for the links to the detail page in staff
and this also selected the link to the detail page in OPAC. By changing
detail.pl to \detail.pl opac-detail.pl will no longer be selected.
To test:
- Search in the staff interface
- Click "OPAC view" links in staff result lists
- Click "OPAC view' links in detai page
- Verify both now open in a new tab
- Click other links and test that navigation (previous, next,
return to results) works as expected
- Inside the staff client, you should see something like
searchid=scs_1533922927978 added to the URLs
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and it works.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 880afc9035c752bb6fbea0ad5505d8730462ce2c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit bed533eb345b91cb9e0e019a37ebb201dcb94726)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 784b7d7af2be71e7feae2cea5b754ab4f3abf646
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>
(cherry picked from commit 74a2565c99dc92e390950c7ce340202efba2161c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 3f24a07a7ee83859aed10a0d874438a6c6fad2a2
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>
(cherry picked from commit 9a6ed1c852c00644349597e59a369bef5a19d9a1)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit fc0841f55432464c6e73eb485b2babd0f7598133
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>
(cherry picked from commit 4fd18a7df711f5a59f459234ec186b175ee05eb6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 68828e1a5351a2f2f9cbf8e9d98544b2647af447
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>
(cherry picked from commit 1dfa4318262a908b1df9d8d2454c15a39c84416c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 0afb31f6190edfa55c55acfb38cd89a17acc1ee7
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>
(cherry picked from commit fe9888e1ab5aa67c4b52efb1dbca5290e9c3dfd7)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Patron.pm | 2 +-
acqui/basket.pl | 4 ++--
debian/scripts/koha-rebuild-zebra | 4 ++--
koha-tmpl/intranet-tmpl/js/browser.js | 4 ++--
.../prog/en/includes/wysiwyg-systempreferences.inc | 8 ++------
.../prog/en/modules/acqui/basketheader.tt | 18 +++++++++---------
.../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +-
.../bootstrap/en/modules/opac-search-history.tt | 1 +
misc/cronjobs/runreport.pl | 1 +
t/db_dependent/Reserves.t | 11 ++++-------
10 files changed, 25 insertions(+), 30 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list