Bugzilla – Attachment 98268 Details for
Bug 23590
Add the ability to change the manager of a suggestion and notify the new manager
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23590: (QA follow-up) Fix some problems created by recent changes and updatedatabase statement
Bug-23590-QA-follow-up-Fix-some-problems-created-b.patch (text/plain), 4.28 KB, created by
Katrin Fischer
on 2020-02-01 20:53:38 UTC
(
hide
)
Description:
Bug 23590: (QA follow-up) Fix some problems created by recent changes and updatedatabase statement
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2020-02-01 20:53:38 UTC
Size:
4.28 KB
patch
obsolete
>From efc6209eedb89129a6e62e3ca77586c389a687e6 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >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 2bb203c345..9620448533 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 65a5252db2..35dd6773f8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -581,7 +581,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' }, > } > ); > >-- >2.17.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23590
:
95162
|
95163
|
95164
|
95165
|
95166
|
95167
|
95168
|
95169
|
95317
|
95318
|
95319
|
95320
|
95321
|
95322
|
95323
|
95324
|
95398
|
95399
|
95407
|
95408
|
95420
|
95421
|
95422
|
95423
|
95424
|
95425
|
95426
|
95427
|
95428
|
95429
|
95430
|
95431
|
95487
|
95488
|
95489
|
95490
|
95491
|
95492
|
95493
|
95494
|
95495
|
95496
|
95497
|
95498
|
98119
|
98120
|
98121
|
98122
|
98123
|
98124
|
98126
|
98127
|
98128
|
98129
|
98130
|
98131
|
98240
|
98267
|
98268
|
98279
|
100788
|
100789
|
100790
|
100791
|
100792
|
100793
|
100794
|
100795
|
100796
|
100797
|
100798
|
100799
|
100800
|
100801
|
100802
|
100803
|
100804
|
100846
|
100847
|
100848
|
100849
|
100850
|
100851
|
100852
|
100853
|
101539
|
101548
|
101588
|
101589
|
101590
|
101591
|
101592
|
101593
|
101594
|
101595
|
101596
|
101597
|
101598
|
101599
|
101600
|
101601
|
101602
|
101603
|
101604
|
101605
|
101606
|
101695