From 06dd52659dbb9c23b40e825dd536c40c209eaa10 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) - Remove '- ' displying before the date --- admin/columns_settings.yml | 4 ++++ installer/data/mysql/atomicupdate/bug_23590.perl | 2 +- .../intranet-tmpl/prog/en/modules/common/patron_search.tt | 2 +- .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 2 +- suggestion/add_user_search.pl | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index ede1cdf367..6595aeb958 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -126,6 +126,10 @@ modules: columnname: managed_by - columnname: managed_on + - + columnname: lastmodificationby + - + columnname: lastmodificationdate - columnname: library - 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/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index 77c4370925..a77dd87941 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -586,7 +586,7 @@ [% suggestions_loo.surnamelastmodificationby | html %][% IF ( suggestions_loo.firstnamelastmodificationby ) %], [% suggestions_loo.firstnamelastmodificationby | html %][% END %] - [% IF ( suggestions_loo.lastmodificationdate ) %] - [% suggestions_loo.lastmodificationdate | $KohaDates %][% END %] + [% IF ( suggestions_loo.lastmodificationdate ) %][% suggestions_loo.lastmodificationdate | $KohaDates %][% END %] [% Branches.GetName( suggestions_loo.branchcode ) | html %] 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.20.1