[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-99-ga2b4f38
Git repo owner
gitmaster at git.koha-community.org
Thu Aug 16 13:03:50 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 a2b4f38712694b55aa4c631e4b0d0a65e2adc002 (commit)
via 40bfb7913da164f03ff44956218a8e314f87aeba (commit)
via dbdd2b56303be0fab287d861dbd9007bf554f9d8 (commit)
via 5fe28bf39877440025e2a7ee1b2db1054be47852 (commit)
via 718af573c158412e1dc24308d2e1129b70cef861 (commit)
via 71adb4380c101b10ddbda95be32806052e75d0d0 (commit)
via 5eecc789af216e56638525961a8c25dd9677c9db (commit)
via 106ad2d6f01e6bdcf79b54791a437ae31746a059 (commit)
via 3d0d2a35585b6563148178d41545db09dcc8c007 (commit)
via af2ccb13e3001f388a320a0619e22871429e09b5 (commit)
via bed533eb345b91cb9e0e019a37ebb201dcb94726 (commit)
via 647f451e495cd37aed0b50037441a5f7cb1a4981 (commit)
from d2cff3c68cb06ffb9597c37766ef8490294ef737 (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 a2b4f38712694b55aa4c631e4b0d0a65e2adc002
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jul 24 16:10:53 2018 +0000
Bug 21112: Re-indent staff client cart template
This patch reindents the template for the staff client cart, basket.tt
- Trailing spaces removed
- Indentation changed to a consistent 4 spaces
- Markup indentation made more consistent
To test, apply the patch and add multiple items to the cart in the staff
client.
View the cart and confirm that it looks as it should both in the "brief"
and "more details" views.
HTML validation before and after the patch should return the same
results.
Signed-off-by: DEVINIM <kohadevinim at devinim.com.tr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 4ae91ba2633bac7ec607c8519433ba3cacbde1fd)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 40bfb7913da164f03ff44956218a8e314f87aeba
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>
commit dbdd2b56303be0fab287d861dbd9007bf554f9d8
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>
commit 5fe28bf39877440025e2a7ee1b2db1054be47852
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>
commit 718af573c158412e1dc24308d2e1129b70cef861
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>
commit 71adb4380c101b10ddbda95be32806052e75d0d0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 13:18:47 2018 -0300
Bug 21139: No table in toolbar
We do not need this selector, we will not have a table in the toolbar
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 40577065b60ab87330f1fc0c3e6bbe52f2373e6c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5eecc789af216e56638525961a8c25dd9677c9db
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 12:34:29 2018 -0300
Bug 21139: Floating toolbar - Resize toolbar on window resize
Prior to this patch the toolbar was not resized when the window was
resized
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 5ecf4da7d49357832b77ee087d968e071ab46b93)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 106ad2d6f01e6bdcf79b54791a437ae31746a059
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 12:31:01 2018 -0300
Bug 21139: Floating toolbar - Remove horizontal scrollbar on resize
To test:
- add/edit a patron
- resize the window
=> Without this patch a horizontal scrollbar appears when resized
shorter
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 b5520f3e019f38cbd2ea75be0a13806f68a2f515)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3d0d2a35585b6563148178d41545db09dcc8c007
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 12:28:54 2018 -0300
Bug 21139: Floating toolbars - Remove unecessary height
This patch remove some pixels under the toolbar, they were used by the
hidden element.
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 2588811ef249f0996527e952e4ef5307c1834a71)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit af2ccb13e3001f388a320a0619e22871429e09b5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 12:28:37 2018 -0300
Bug 21139: Floating toolbar - Remove dup id
We should not have twice the same id, we always use fixFloat() on an
element with an id and then duplicate this element.
The id must be changed (just in case)
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 77196e91402cdb59242f80e596f1812d238923c2)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bed533eb345b91cb9e0e019a37ebb201dcb94726
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>
commit 647f451e495cd37aed0b50037441a5f7cb1a4981
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Aug 10 17:39:09 2018 -0300
Bug 21208: Fix housebound deliverer/chooser names
When creating a housebound visit, the names of the chooser and deliverer are the
same as the housebound patron (even though the housebound patron does not have
chooser and deliverer roles).
It has been caused by:
commit 5f80977875ff124d411f2cd89de4a944fa9c27af
Bug 18403: Use patron-title.inc when hidepatronname is used
patron-title.inc now starts looking for a variable named "patron", which exists in
members/housebound.
A better fix could be to renamed this "patron" variable tested by
patron-title.inc, but at first glance it's the only place this issue
exists.
Test plan:
1- Make sure HouseboundModule is enabled in system preferences
2- Go to a patron file (Patron A)
3- Edit this patron's housebound roles to Chooser
4- Go to another patron file (Patron B)
5- Edit this patron's housebound roles to Deliverer
6- Go to a third patron's file (Patron C)
7- Go to the Housebound tab
8- Fill out the housebound profile for Patron c
9- Click on "Add a new delivery"
10- Fill out day and time
11- Check the Chooser drop down
12- Check the Deliverer drop down
13- Save the delivery
14- Notice the Chooser and Deliverer names are correct
15- Click on the name of the Chooser, it goes to Patron A's file
16- Go back and click on the name of the Deliverer, it goes to Patron B's file
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit cacb57689070315fd1fae176e3761abc6870107f)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
debian/scripts/koha-rebuild-zebra | 4 +-
koha-tmpl/intranet-tmpl/js/browser.js | 4 +-
.../lib/jquery/plugins/jquery.fixFloat.js | 17 +-
.../prog/en/modules/acqui/basketheader.tt | 18 +-
.../intranet-tmpl/prog/en/modules/basket/basket.tt | 526 +++++++++++---------
.../prog/en/modules/members/housebound.tt | 16 +-
.../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +-
7 files changed, 316 insertions(+), 271 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list