gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 31095: Remove borrower_debarments and patron_restrictions includes 

This patch removes the aforementioned includes and drops the last
remaining reference to them.

We have replaces these includes with patron-restrictions-tab.inc and
restriction-types.inc.

Test plan
1. Confirm the includes are no longer referenced anywhere in the
   codebase. 'git grep borrower_debarments.inc', 'git grep
   patron_restrictions.inc'

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Martin Renvoize 2022-08-24 16:16:34 +01:00 committed by Tomas Cohen Arazi
parent 4017946876
commit 6388fbbd7f
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
3 changed files with 0 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
View File

@ -1,82 +0,0 @@
[% USE raw %]
[% USE Koha %]
[% PROCESS 'patron_restrictions.inc' %]
<div id="reldebarments" role="tabpanel" class="tab-pane">
[% IF ( not debarments.defined || debarments.size < 1 ) %]
<p>Patron is currently unrestricted.</p>
[% ELSE %]
<table>
<thead>
<tr>
<th>Type</th>
<th>Comment</th>
<th>Expiration</th>
<th>Created</th>
[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
<th>&nbsp;</th>
[% END %]
</tr>
</thead>
<tbody>
[% FOREACH d IN debarments %]
[% dtype = d.type %]
<tr>
<td>
[% PROCESS restriction_type_description restriction=restriction_types.$dtype %]
</td>
<td>
[% IF d.comment.search('OVERDUES_PROCESS') %]
<span>Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %]</span>
[% ELSE %]
[% d.comment | $raw %]
[% END %]
</td>
<td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <em>Indefinite</em> [% END %]</td>
<td>[% d.created | $KohaDates %]</td>
[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
<td>
<a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% patron.borrowernumber | html %]&amp;borrower_debarment_id=[% d.borrower_debarment_id | html %]&amp;action=del">
<i class="fa fa-trash"></i> Remove
</a>
</td>
[% END %]
</tr>
[% END %]
</tbody>
</table>
[% END %]
[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
<p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
<form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
<input type="hidden" name="action" value="add" />
<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 %]
[% IF !restriction_types.$code.is_system %]
[% IF restriction_types.$code.is_default %]
<option value="[% code | html %]" selected>[% PROCESS restriction_type_description restriction=restriction_types.$code %]</option>
[% ELSE %]
<option value="[% code | html %]">[% PROCESS restriction_type_description restriction=restriction_types.$code %]</option>
[% END %]
[% END %]
[% END %]
</select>
</li>
[% END %]
<li><label for="rcomment">Comment:</label> <input type="text" id="rcomment" name="comment" /></li>
<li>
<label for="rexpiration">Expiration:</label>
<input name="expiration" id="rexpiration" size="20" value="" class="flatpickr" data-flatpickr-futuredate="true" type="text" />
</li>
</ol>
<fieldset class="action"><input type="submit" value="Add restriction" /> <a href="#" class="cancel" id="cancel_manual_restriction">Cancel</a></fieldset>
</fieldset>
</form>
[% END %]
</div>

10
koha-tmpl/intranet-tmpl/prog/en/includes/patron_restrictions.inc
View File

@ -1,10 +0,0 @@
[%- BLOCK restriction_type_description -%]
[%- ddisplay = restriction.display_text -%]
[%- SWITCH ddisplay -%]
[%- CASE 'Manual' -%]<span>Manual</span>
[%- CASE 'Overdues' -%]<span>Overdues</span>
[%- CASE 'Suspension' -%]<span>Suspension</span>
[%- CASE 'Discharge' -%]<span>Discharge</span>
[%- CASE -%]<span>[% ddisplay | html %]</span>
[%- END -%]
[%- END -%]

1
koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
View File

@ -1,7 +1,6 @@
[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% PROCESS 'patron_restrictions.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>[% IF op == 'add_form' %][% IF ( restriction ) %]Modify restriction '[% PROCESS restriction_type_description %]'[% ELSE %]New restriction[% END %][% END %]