From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Fri, 31 Jan 2020 21:18:29 +0000 (+0000)
Subject: Bug 23590: (QA follow-up) Fix some problems created by recent changes and updatedatab... 
X-Git-Tag: v20.05.00~876
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=5ce2d5cb7fb5e47e12554b9483459329ec693b91;p=srvgit

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 282d929ff3..08ea52b925 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/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index f55c90fd72..ba1b10cd4c 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 @@
                     <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.lastmodificationby | uri %]">[% suggestions_loo.surnamelastmodificationby | html %][% IF ( suggestions_loo.firstnamelastmodificationby ) %], [% suggestions_loo.firstnamelastmodificationby | html %][% END %]</a>
                 </td>
                 <td data-order="[% suggestions_loo.lastmodificationdate | html %]">
-                    [% IF ( suggestions_loo.lastmodificationdate ) %] - [% suggestions_loo.lastmodificationdate | $KohaDates %][% END %]
+                    [% IF ( suggestions_loo.lastmodificationdate ) %][% suggestions_loo.lastmodificationdate | $KohaDates %][% END %]
                 </td>
                 <td>
                     [% 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' },
     }
 );