@@ -, +, @@ 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(-) --- a/admin/columns_settings.yml +++ a/admin/columns_settings.yml @@ -126,6 +126,10 @@ modules: columnname: managed_by - columnname: managed_on + - + columnname: lastmodificationby + - + columnname: lastmodificationdate - columnname: library - --- a/installer/data/mysql/atomicupdate/bug_23590.perl +++ a/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 |); } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt +++ a/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 %] ); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -581,7 +581,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 %] --- a/suggestion/add_user_search.pl +++ a/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' }, } ); --