Attachment 142065 Details for Bug 31095 – Bug 31095: Remove borrower_debarments and patron_restrictions includes

[patch] Bug 31095: Remove borrower_debarments and patron_restrictions includes

Bug-31095-Remove-borrowerdebarments-and-patronrest.patch (text/plain), 7.16 KB, created by Martin Renvoize (ashimema) on 2022-10-18 14:08:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-10-18 14:08:57 UTC

Size: 7.16 KB

patch

obsolete

>From 511fce51477a74ca9dd2b61c9fb25dd4709caf12 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 24 Aug 2022 16:16:34 +0100
>Subject: [PATCH] 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>
>---
> .../prog/en/includes/borrower_debarments.inc  | 82 -------------------
> .../prog/en/includes/patron_restrictions.inc  | 10 ---
> .../prog/en/modules/admin/restrictions.tt     |  1 -
> 3 files changed, 93 deletions(-)
> delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
> delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron_restrictions.inc
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
>deleted file mode 100644
>index c6b7dff63e..0000000000
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
>+++ /dev/null
>@@ -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>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_restrictions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_restrictions.inc
>deleted file mode 100644
>index 7faa38b0aa..0000000000
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_restrictions.inc
>+++ /dev/null
>@@ -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 -%]
>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 cc2be69146..cd1949aee5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
>@@ -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 %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 31095: 139614 | 139719 | 139720 | 139721 | 139722 | 139723 | 139724 | 139725 | 139726 | 139727 | 139728 | 139742 | 139743 | 139744 | 139745 | 139746 | 139747 | 139748 | 139749 | 139750 | 139751 | 139752 | 139753 | 139754 | 139755 | 139756 | 139757 | 139758 | 140714 | 140715 | 140716 | 140717 | 140718 | 140719 | 140720 | 140721 | 140722 | 140723 | 140724 | 140725 | 140726 | 140727 | 140728 | 140729 | 140730 | 140731 | 142059 | 142060 | 142061 | 142062 | 142063 | 142064 | 142065 | 142066 | 142067 | 142068 | 142069 | 142070 | 142071 | 142072 | 142073 | 142074 | 142075 | 142076 | 143745 | 143746 | 143747 | 143748 | 143749 | 143750 | 143751 | 143752 | 143753 | 143754 | 143755 | 143756 | 143757 | 143758 | 143759 | 143760 | 143761 | 143762 | 143763 | 144903 | 144904 | 144905 | 144906 | 144907 | 144908 | 144909 | 144910 | 144911 | 144912 | 144913 | 144914 | 144915 | 144916 | 144917 | 144918 | 144919 | 144920 | 144921 | 145800 | 145801 | 145803 | 145845