Bugzilla – Attachment 139793 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) New schema files
Bug-23681-QA-follow-up-New-schema-files.patch (text/plain), 4.25 KB, created by
Martin Renvoize (ashimema)
on 2022-08-25 11:39:45 UTC
(
hide
)
Description:
Bug 23681: (QA follow-up) New schema files
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-08-25 11:39:45 UTC
Size:
4.25 KB
patch
obsolete
>From 7f793363b81d2f49ed196360723000c35895d5b9 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Fri, 19 Aug 2022 14:59:49 -0300 >Subject: [PATCH] Bug 23681: (QA follow-up) New schema files > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > Koha/RestrictionType.pm | 6 +++--- > Koha/RestrictionTypes.pm | 8 ++------ > Koha/Schema/Result/BorrowerDebarment.pm | 10 +++++----- > .../Result/{DebarmentType.pm => RestrictionType.pm} | 12 ++++++------ > 4 files changed, 16 insertions(+), 20 deletions(-) > rename Koha/Schema/Result/{DebarmentType.pm => RestrictionType.pm} (82%) > >diff --git a/Koha/RestrictionType.pm b/Koha/RestrictionType.pm >index d6f6690369..a86a1d0564 100644 >--- a/Koha/RestrictionType.pm >+++ b/Koha/RestrictionType.pm >@@ -28,7 +28,7 @@ Koha::RestrictionType - Koha RestrictionType Object class > > =head1 API > >-=head2 Class Methods >+=head2 Class methods > > =head3 delete > >@@ -87,12 +87,12 @@ sub make_default { > > =head2 Internal methods > >-=head3 type >+=head3 _type > > =cut > > sub _type { >- return 'DebarmentType'; >+ return 'RestrictionType'; > } > > 1; >diff --git a/Koha/RestrictionTypes.pm b/Koha/RestrictionTypes.pm >index 60ca1e252c..aa783bd104 100644 >--- a/Koha/RestrictionTypes.pm >+++ b/Koha/RestrictionTypes.pm >@@ -17,10 +17,6 @@ package Koha::RestrictionTypes; > > use Modern::Perl; > >-use Carp; >- >-use C4::Context; >- > use Koha::Database; > use Koha::RestrictionType; > >@@ -32,7 +28,7 @@ Koha::RestrictionTypes - Koha Restriction Types Object set class > > =head1 API > >-=head2 Class Methods >+=head2 Class methods > > =cut > >@@ -59,7 +55,7 @@ sub keyed_on_code { > =cut > > sub _type { >- return 'DebarmentType'; >+ return 'RestrictionType'; > } > > =head3 object_class >diff --git a/Koha/Schema/Result/BorrowerDebarment.pm b/Koha/Schema/Result/BorrowerDebarment.pm >index 7c27d56d30..9c025284e5 100644 >--- a/Koha/Schema/Result/BorrowerDebarment.pm >+++ b/Koha/Schema/Result/BorrowerDebarment.pm >@@ -54,7 +54,7 @@ expiration date of the restriction > is_nullable: 0 > size: 50 > >-type of restriction, FK to debarment_types.code >+type of restriction, FK to restriction_types.code > > =head2 comment > >@@ -150,20 +150,20 @@ __PACKAGE__->belongs_to( > > Type: belongs_to > >-Related object: L<Koha::Schema::Result::DebarmentType> >+Related object: L<Koha::Schema::Result::RestrictionType> > > =cut > > __PACKAGE__->belongs_to( > "type", >- "Koha::Schema::Result::DebarmentType", >+ "Koha::Schema::Result::RestrictionType", > { code => "type" }, > { is_deferrable => 1, on_delete => "NO ACTION", on_update => "CASCADE" }, > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07049 @ 2022-05-04 11:05:19 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:bxRDwUTv9cZVpDfNDatosQ >+# Created by DBIx::Class::Schema::Loader v0.07049 @ 2022-08-19 17:53:04 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kDCkA7XrjKXlrFG5lk8Lgg > > > # You can replace this text with custom code or comments, and it will be preserved on regeneration >diff --git a/Koha/Schema/Result/DebarmentType.pm b/Koha/Schema/Result/RestrictionType.pm >similarity index 82% >rename from Koha/Schema/Result/DebarmentType.pm >rename to Koha/Schema/Result/RestrictionType.pm >index 9c15cdc051..5131979ae4 100644 >--- a/Koha/Schema/Result/DebarmentType.pm >+++ b/Koha/Schema/Result/RestrictionType.pm >@@ -1,12 +1,12 @@ > use utf8; >-package Koha::Schema::Result::DebarmentType; >+package Koha::Schema::Result::RestrictionType; > > # Created by DBIx::Class::Schema::Loader > # DO NOT MODIFY THE FIRST PART OF THIS FILE > > =head1 NAME > >-Koha::Schema::Result::DebarmentType >+Koha::Schema::Result::RestrictionType > > =cut > >@@ -15,11 +15,11 @@ use warnings; > > use base 'DBIx::Class::Core'; > >-=head1 TABLE: C<debarment_types> >+=head1 TABLE: C<restriction_types> > > =cut > >-__PACKAGE__->table("debarment_types"); >+__PACKAGE__->table("restriction_types"); > > =head1 ACCESSORS > >@@ -89,8 +89,8 @@ __PACKAGE__->has_many( > ); > > >-# Created by DBIx::Class::Schema::Loader v0.07049 @ 2022-05-04 11:05:19 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:cRSViJItfpT3mxCX82/9eQ >+# Created by DBIx::Class::Schema::Loader v0.07049 @ 2022-08-19 17:53:05 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CC8yZ6IqZPnySpMC5Mn/ig > > __PACKAGE__->add_columns( > '+is_system' => { is_boolean => 1 }, >-- >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