From 9ce38a37d49800639b944b7c5d4012252981aa31 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 31 Jan 2020 21:18:29 +0000 Subject: [PATCH] Bug 23590: (QA follow-up) Fix some problems created by recent changes and updatedatabase statement - Ensure that the sequence of columns will be the same for new and updated installations (add AFTER ...) - Fix permissions (see bug 22868) - Fix column configuration (see 16784) --- admin/columns_settings.yml | 4 ++++ installer/data/mysql/atomicupdate/bug_23590.perl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt | 2 +- suggestion/add_user_search.pl | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 2bb203c345..9620448533 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -127,6 +127,10 @@ modules: - columnname: managed_on - + columnname: lastmodificationby + - + columnname: lastmodificationdate + - columnname: library - columnname: library_fund diff --git a/installer/data/mysql/atomicupdate/bug_23590.perl b/installer/data/mysql/atomicupdate/bug_23590.perl index cb6d48d2e4..d71862fc13 100644 --- a/installer/data/mysql/atomicupdate/bug_23590.perl +++ b/installer/data/mysql/atomicupdate/bug_23590.perl @@ -11,7 +11,7 @@ if( CheckVersion( $DBversion ) ) { } if( !column_exists( 'suggestions', 'lastmodificationdate' ) ) { $dbh->do(q| - ALTER TABLE suggestions ADD COLUMN lastmodificationdate DATE DEFAULT NULL + ALTER TABLE suggestions ADD COLUMN lastmodificationdate DATE DEFAULT NULL AFTER lastmodificationby |); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt index 19cd0ab952..f8dcf45440 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt @@ -174,7 +174,7 @@ [% ELSIF patrons_with_suggestion_perm_only %] ,{ 'name': 'has_permission', - 'value': 'acquisition.suggestions_manage', + 'value': 'suggestions.suggestions_manage', } [% END %] ); diff --git a/suggestion/add_user_search.pl b/suggestion/add_user_search.pl index 290f80d466..25014475ed 100755 --- a/suggestion/add_user_search.pl +++ b/suggestion/add_user_search.pl @@ -33,7 +33,7 @@ my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user( query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => { acquisition => 'suggestions_manage' }, + flagsrequired => { suggestions => 'suggestions_manage' }, } ); -- 2.11.0