Bugzilla – Attachment 139256 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: Allow for selection of restriction type
Bug-23681-Allow-for-selection-of-restriction-type.patch (text/plain), 6.39 KB, created by
Martin Renvoize (ashimema)
on 2022-08-17 11:19:57 UTC
(
hide
)
Description:
Bug 23681: Allow for selection of restriction type
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-08-17 11:19:57 UTC
Size:
6.39 KB
patch
obsolete
>From b2b36814407f6d9e3a25615310b074151e1a23dd Mon Sep 17 00:00:00 2001 >From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com> >Date: Thu, 3 Oct 2019 15:13:27 +0100 >Subject: [PATCH] Bug 23681: Allow for selection of restriction type > >This patch displays a restriction type select box (when appropriate) >when adding manual patron restrictions > >Sponsored-by: Loughborough University >Signed-off-by: Benjamin Veasey <B.T.Veasey@lboro.ac.uk> >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >--- > .../prog/en/includes/borrower_debarments.inc | 11 +++++++++++ > .../prog/en/modules/members/memberentrygen.tt | 10 ++++++++++ > members/memberentry.pl | 4 ++-- > members/mod_debarment.pl | 3 ++- > members/moremember.pl | 2 +- > 5 files changed, 26 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >index dbc1273f88..126979c74b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >@@ -1,4 +1,5 @@ > [% USE raw %] >+[% USE Koha %] > <div id="reldebarments"> > [% IF ( not debarments.defined || debarments.size < 1 ) %] > <p>Patron is currently unrestricted.</p> >@@ -51,6 +52,16 @@ > <fieldset class="rows" id="manual_restriction_form"> > <legend>Add manual restriction</legend> > <ol> >+ [% IF Koha.Preference('PatronRestrictionTypes') %] >+ <li> >+ <label for="debarred_type">Type:</label> >+ <select name="debarred_type"> >+ [% FOREACH code IN restriction_types.keys %] >+ <option value="[% code | html %]">[% restriction_types.$code.display_text | html %]</option> >+ [% END %] >+ </select> >+ </li> >+ [% END %] > <li><label for="rcomment">Comment:</label> <input type="text" id="rcomment" name="comment" /></li> > <li> > <label for="rexpiration">Expiration:</label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >index 5d304031dc..ade7a102bc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -1397,6 +1397,16 @@ legend:hover { > <input type="hidden" id="add_debarment" name="add_debarment" value="0" /> > <legend id="manual_restriction_lgd">Add manual restriction</legend> > <ol> >+ [% IF Koha.Preference('PatronRestrictionTypes') %] >+ <li> >+ <label for="debarred_type">Type:</label> >+ <select name="debarred_type"> >+ [% FOREACH code IN restriction_types.keys %] >+ <option value="[% code | html %]">[% restriction_types.$code.display_text | html %]</option> >+ [% END %] >+ </select> >+ </li> >+ [% END %] > <li> > <label for="debarred_comment">Comment: </label> > <input type="text" id="debarred_comment" name="debarred_comment" /> >diff --git a/members/memberentry.pl b/members/memberentry.pl >index 9e39036fab..c5f2eaec12 100755 >--- a/members/memberentry.pl >+++ b/members/memberentry.pl >@@ -136,7 +136,7 @@ if ( $input->param('add_debarment') ) { > AddDebarment( > { > borrowernumber => $borrowernumber, >- type => 'MANUAL', >+ type => scalar $input->param('debarred_type') // 'MANUAL', > comment => scalar $input->param('debarred_comment'), > expiration => $expiration, > } >@@ -234,7 +234,7 @@ if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) > qr/^\d+-DAYS/, > qr/^patron_attr_/, > qr/^csrf_token$/, >- qr/^add_debarment$/, qr/^debarred_comment$/,qr/^debarred_expiration$/, qr/^remove_debarment$/, # We already dealt with debarments previously >+ qr/^add_debarment$/, qr/^debarred_comment$/,qr/^debarred_expiration$/, qr/^debarred_type$/, qr/^remove_debarment$/, # We already dealt with debarments previously > qr/^housebound_chooser$/, qr/^housebound_deliverer$/, > qr/^select_city$/, > qr/^new_guarantor_/, >diff --git a/members/mod_debarment.pl b/members/mod_debarment.pl >index 977cb2fddd..e9a99eec8c 100755 >--- a/members/mod_debarment.pl >+++ b/members/mod_debarment.pl >@@ -44,6 +44,7 @@ if ( $action eq 'del' ) { > DelDebarment( scalar $cgi->param('borrower_debarment_id') ); > } elsif ( $action eq 'add' ) { > my $expiration = $cgi->param('expiration'); >+ my $type = $cgi->param('debarred_type') // 'MANUAL'; > if ($expiration) { > $expiration = dt_from_string($expiration); > $expiration = $expiration->ymd(); >@@ -51,7 +52,7 @@ if ( $action eq 'del' ) { > > AddDebarment( > { borrowernumber => $borrowernumber, >- type => 'MANUAL', >+ type => $type, > comment => scalar $cgi->param('comment'), > expiration => $expiration, > } >diff --git a/members/moremember.pl b/members/moremember.pl >index 478b8e0b67..e966647a54 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -82,7 +82,7 @@ for (qw(gonenoaddress lost borrowernotes is_debarred)) { > > $template->param( > restriction_types => scalar Koha::RestrictionTypes->keyed_on_code() >-} >+); > > if ( $patron->is_debarred ) { > $template->param( >-- >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