Bugzilla – Attachment 139781 Details for
Bug 23681
Make patron restrictions user definable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23681: (QA follow-up) Rename columns
Bug-23681-QA-follow-up-Rename-columns.patch (text/plain), 6.85 KB, created by
Martin Renvoize (ashimema)
on 2022-08-25 11:38:07 UTC
(
hide
)
Description:
Bug 23681: (QA follow-up) Rename columns
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-08-25 11:38:07 UTC
Size:
6.85 KB
patch
obsolete
>From 74db61c3ad5439bdc7985349cd9236027ed32e81 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Mon, 28 Mar 2022 12:40:55 +0100 >Subject: [PATCH] Bug 23681: (QA follow-up) Rename columns > >Renames ronly to readonly and dflt to is_system. > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >--- > .../bug_23681_add_debarment_types.perl | 6 +++--- > .../en/mandatory/patron_restrictions.sql | 2 +- > installer/data/mysql/kohastructure.sql | 4 ++-- > .../prog/en/modules/admin/restrictions.tt | 4 ++-- > t/db_dependent/RestrictionType.t | 16 +++++++-------- > t/db_dependent/RestrictionTypes.t | 20 +++++++++---------- > 6 files changed, 26 insertions(+), 26 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_23681_add_debarment_types.perl b/installer/data/mysql/atomicupdate/bug_23681_add_debarment_types.perl >index 0050b230eb..7380e141b2 100644 >--- a/installer/data/mysql/atomicupdate/bug_23681_add_debarment_types.perl >+++ b/installer/data/mysql/atomicupdate/bug_23681_add_debarment_types.perl >@@ -7,12 +7,12 @@ if ( CheckVersion( $DBversion ) ) { > CREATE TABLE debarment_types ( > code varchar(50) NOT NULL PRIMARY KEY, > display_text text NOT NULL, >- ronly tinyint(1) NOT NULL DEFAULT 0, >- dflt tinyint(1) NOT NULL DEFAULT 0 >+ readonly tinyint(1) NOT NULL DEFAULT 0, >+ system tinyint(1) NOT NULL DEFAULT 0 > ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > | ); > $dbh->do( q| >- INSERT INTO debarment_types (code, display_text, ronly, dflt) VALUES >+ INSERT INTO debarment_types (code, display_text, readonly, system) VALUES > ('MANUAL', 'Manual', 1, 1), > ('OVERDUES', 'Overdues', 1, 0), > ('SUSPENSION', 'Suspension', 1, 0), >diff --git a/installer/data/mysql/en/mandatory/patron_restrictions.sql b/installer/data/mysql/en/mandatory/patron_restrictions.sql >index a6eedf27a9..c3e61322ad 100644 >--- a/installer/data/mysql/en/mandatory/patron_restrictions.sql >+++ b/installer/data/mysql/en/mandatory/patron_restrictions.sql >@@ -1,4 +1,4 @@ >-INSERT INTO debarment_types (code, display_text, ronly, dflt) VALUES >+INSERT INTO debarment_types (code, display_text, readonly, system) VALUES > ('MANUAL', 'Manual', 1, 1), > ('OVERDUES', 'Overdues', 1, 0), > ('SUSPENSION', 'Suspension', 1, 0), >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index 7eb0e043be..f527b11fb3 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -2085,8 +2085,8 @@ DROP TABLE IF EXISTS `debarment_types`; > CREATE TABLE debarment_types ( > code varchar(50) NOT NULL PRIMARY KEY, > display_text text NOT NULL, >- ronly tinyint(1) NOT NULL DEFAULT 0, >- dflt tinyint(1) NOT NULL DEFAULT 0 >+ readonly tinyint(1) NOT NULL DEFAULT 0, >+ is_system tinyint(1) NOT NULL DEFAULT 0 > ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > > -- >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt >index c9b463061f..ff7375cda2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt >@@ -170,11 +170,11 @@ > [% restriction.display_text | html %] > </td> > <td> >- [% IF restriction.dflt %]Yes[% END %] >+ [% IF restriction.is_system %]Yes[% END %] > </td> > <td class="actions"> > <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/restrictions.pl?op=add_form&code=[% restriction.code | uri %]"><i class="fa fa-pencil"></i> Edit</a> >- [% IF !restriction.ronly %] >+ [% IF !restriction.readonly %] > <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/restrictions.pl?op=delete_confirm&code=[% restriction.code | uri %]"><i class="fa fa-trash"></i> Delete</a> > [% END %] > </td> >diff --git a/t/db_dependent/RestrictionType.t b/t/db_dependent/RestrictionType.t >index 28bc464e19..aea33a5800 100755 >--- a/t/db_dependent/RestrictionType.t >+++ b/t/db_dependent/RestrictionType.t >@@ -24,8 +24,8 @@ $builder->build({ > value => { > code => 'ONE', > display_text => 'One', >- ronly => 1, >- dflt => 0 >+ readonly => 1, >+ is_system => 0 > } > }); > $builder->build({ >@@ -33,8 +33,8 @@ $builder->build({ > value => { > code => 'TWO', > display_text => 'Two', >- ronly => 1, >- dflt => 1 >+ readonly => 1, >+ is_system => 1 > } > }); > >@@ -44,14 +44,14 @@ my $expecting = { > ONE => { > code => 'ONE', > display_text => 'One', >- ronly => 1, >- dflt => 0 >+ readonly => 1, >+ is_system => 0 > }, > TWO => { > code => 'TWO', > display_text => 'Two', >- ronly => 1, >- dflt => 1 >+ readonly => 1, >+ is_system => 1 > } > }; > >diff --git a/t/db_dependent/RestrictionTypes.t b/t/db_dependent/RestrictionTypes.t >index 567631a8a7..1251846579 100755 >--- a/t/db_dependent/RestrictionTypes.t >+++ b/t/db_dependent/RestrictionTypes.t >@@ -24,8 +24,8 @@ $builder->build({ > value => { > code => 'ONE', > display_text => 'One', >- ronly => 1, >- dflt => 0 >+ readonly => 1, >+ is_system => 0 > } > }); > $builder->build({ >@@ -33,8 +33,8 @@ $builder->build({ > value => { > code => 'TWO', > display_text => 'Two', >- ronly => 1, >- dflt => 1 >+ readonly => 1, >+ is_system => 1 > } > }); > $builder->build({ >@@ -42,8 +42,8 @@ $builder->build({ > value => { > code => 'THREE', > display_text => 'Three', >- ronly => 1, >- dflt => 0 >+ readonly => 1, >+ is_system => 0 > } > }); > $builder->build({ >@@ -51,8 +51,8 @@ $builder->build({ > value => { > code => 'FOUR', > display_text => 'Four', >- ronly => 0, >- dflt => 0 >+ readonly => 0, >+ is_system => 0 > } > }); > $builder->build({ >@@ -60,8 +60,8 @@ $builder->build({ > value => { > code => 'FIVE', > display_text => 'Five', >- ronly => 0, >- dflt => 0 >+ readonly => 0, >+ is_system => 0 > } > }); > >-- >2.20.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 23681
:
93769
|
93770
|
93771
|
93772
|
93773
|
93774
|
93775
|
93776
|
93777
|
93778
|
93779
|
93780
|
93781
|
93782
|
93783
|
93784
|
93785
|
93786
|
94862
|
94863
|
94864
|
94865
|
94866
|
94867
|
94868
|
94869
|
94870
|
94896
|
94897
|
94898
|
94899
|
94900
|
94901
|
94902
|
94903
|
94904
|
95148
|
95255
|
95256
|
95257
|
95258
|
95259
|
95260
|
95261
|
95262
|
95263
|
95264
|
99893
|
99894
|
99895
|
99896
|
99897
|
99898
|
99899
|
99900
|
99901
|
99902
|
130373
|
130374
|
130375
|
130376
|
130377
|
130378
|
130379
|
130380
|
130381
|
130382
|
130383
|
130384
|
132302
|
132303
|
132304
|
132305
|
132306
|
132307
|
132308
|
132309
|
132310
|
132311
|
132312
|
132313
|
132314
|
132315
|
132316
|
132318
|
132319
|
132320
|
134512
|
134513
|
134514
|
134515
|
134516
|
134517
|
134518
|
134519
|
134520
|
134521
|
134522
|
134523
|
134524
|
134525
|
134526
|
134527
|
134528
|
134529
|
134580
|
134581
|
134582
|
134583
|
134584
|
134585
|
134586
|
134587
|
134588
|
134589
|
134590
|
134591
|
134592
|
134593
|
134594
|
134595
|
134596
|
134597
|
134598
|
134599
|
134600
|
134601
|
134602
|
134684
|
134685
|
134686
|
134687
|
134688
|
134689
|
134690
|
134691
|
134692
|
134693
|
134694
|
134696
|
134697
|
134698
|
134699
|
134700
|
134701
|
134702
|
134703
|
134704
|
134705
|
134706
|
134707
|
134708
|
136716
|
136717
|
136718
|
136719
|
136720
|
136721
|
136722
|
136723
|
136724
|
136725
|
136726
|
136727
|
136728
|
136729
|
136730
|
136731
|
136732
|
136733
|
136734
|
136735
|
136736
|
136737
|
136738
|
136739
|
137066
|
137067
|
137068
|
137069
|
137070
|
137071
|
137072
|
137073
|
137074
|
137075
|
137076
|
137077
|
137078
|
137079
|
137080
|
137081
|
137082
|
137083
|
137084
|
137085
|
137086
|
137087
|
137088
|
137089
|
137090
|
137091
|
137092
|
137093
|
137094
|
137102
|
137103
|
137104
|
137105
|
137106
|
137107
|
137108
|
137109
|
137110
|
137111
|
137112
|
137113
|
137114
|
137115
|
137116
|
137117
|
137118
|
137119
|
137120
|
137121
|
137122
|
137123
|
137124
|
137125
|
137126
|
137127
|
137128
|
137129
|
137130
|
139250
|
139251
|
139252
|
139253
|
139254
|
139255
|
139256
|
139257
|
139258
|
139259
|
139260
|
139261
|
139262
|
139263
|
139264
|
139265
|
139266
|
139267
|
139268
|
139269
|
139270
|
139271
|
139272
|
139273
|
139509
|
139512
|
139649
|
139717
|
139768
|
139769
|
139770
|
139771
|
139772
|
139773
|
139774
|
139775
|
139776
|
139777
|
139778
|
139779
|
139780
| 139781 |
139782
|
139783
|
139784
|
139785
|
139786
|
139787
|
139788
|
139789
|
139790
|
139791
|
139792
|
139793
|
139794
|
139795