[koha-commits] main Koha release repository branch master updated. v19.11.00-517-gd2931e6850
Git repo owner
gitmaster at git.koha-community.org
Thu Jan 30 11:06:04 CET 2020
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, master has been updated
via d2931e68501901cb89cd1ece9cc23bb8cde39b60 (commit)
via b3215b4482ba771ae6fc650220ae226617ad2a3f (commit)
via 715da06db557edc4b1baa51cc278fdac362c01c4 (commit)
via ae53caa6818939274352fde85454c24112e6f984 (commit)
from a5c82cf0da49b81801d215ee2968754ad655c9cf (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 d2931e68501901cb89cd1ece9cc23bb8cde39b60
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jan 30 10:20:25 2020 +0100
Bug 23493: Fix selenium/regressions.t
One test wants to make sure thead, tfoot and tbody will have th/td's
with the same size/number.
Existing test for tbody was retrieving the grouped td, which has a
colspan of 100%. Note that this 100% value seems to be wrong as it is
interpreted like "100" by the browser. We do not want to test this row
anyway, but the real row, the one with all the td's.
This patch makes it retrieve the second tr and count the number of td it
has.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b3215b4482ba771ae6fc650220ae226617ad2a3f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jan 30 09:37:55 2020 +0000
Bug 23493: (RM follow-up) Let datatables calculate colspan for us
Prior to this we arbitrarily set a colspan of 100 for the rowgroup
header row. If we remove the td wrapper from the render function then
datatables will automatically wrap the output in an appropraite td with
cell with fullwidth colspan correctly set.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 715da06db557edc4b1baa51cc278fdac362c01c4
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jan 30 08:34:06 2020 +0000
Bug 22868: DBRev 19.12.00.016
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ae53caa6818939274352fde85454c24112e6f984
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 14 10:02:11 2020 +0100
Bug 22868: Move suggestions_manage subperm out of acquisition perm
Bug 11911 replaced the permission of suggestions.pl (create a purchase
suggestion) from catalogue => 1 to acquisition => 'suggestions_manage'.
However we have a lot of acquisition scripts that have lax permissions
(acquisition => '*' which means any sub permissions of acquisition is
enough).
That causes problem when a circulation staff can create purchase
suggestions but not access acquisition information.
One solution is to move the suggestions_manage subpermission out of the
acquisition permission and create a new suggestion permission.
Test plan:
0. Setup
* Create a patron with several permission (and full acquisition
permission)
* Create another patron with several permission, and suggestions_manage
permission
* Create another patron without the suggestions_manage permission
1. Apply the patch and execute the update database entry
2. Note that the third patron you create still does not have
suggestions_manage
3. Confirm that you can create a purchase suggestion if you have
suggestions_manage, but cannot access acquisition pages if you do not
have any subpermissions of the acquisition permission
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
installer/data/mysql/updatedatabase.pl | 20 ++++++++++++++++++++
installer/data/mysql/userflags.sql | 3 ++-
installer/data/mysql/userpermissions.sql | 2 +-
.../prog/en/includes/acquisitions-menu.inc | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
.../intranet-tmpl/prog/en/includes/permissions.inc | 5 ++++-
.../prog/en/modules/acqui/acqui-home.tt | 2 +-
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 4 ++--
members/purchase-suggestions.pl | 2 +-
suggestion/suggestion.pl | 2 +-
t/db_dependent/selenium/regressions.t | 4 ++--
13 files changed, 38 insertions(+), 14 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list