Browse Source

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>
20.05.x
Katrin Fischer 3 years ago
committed by Martin Renvoize
parent
commit
5ce2d5cb7f
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
  1. 4
      admin/columns_settings.yml
  2. 2
      installer/data/mysql/atomicupdate/bug_23590.perl
  3. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
  4. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
  5. 2
      suggestion/add_user_search.pl

4
admin/columns_settings.yml

@ -126,6 +126,10 @@ modules:
columnname: managed_by
-
columnname: managed_on
-
columnname: lastmodificationby
-
columnname: lastmodificationdate
-
columnname: library
-

2
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
|);
}

2
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 %]
);

2
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 %]

2
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' },
}
);

Loading…
Cancel
Save