Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 33550: Rename Patron restrictions administration page to Patron restriction types

Browse source 
This patch renames 'Patron restriction' to 'Patron restriction type' in the context of custom restriction type administration.

To test:
0. Apply patch
1. Enable PatronRestrictionTypes
2. Go to Administration
3. Check the name, spelling/grammar of the following elements
   * Section name
   * Section caption
4. Click 'Patron restriction types'
5. Check the name, spelling/grammar of the following elements
   * Title of the page (in the browser tab)
   * Breadcrumb
   * Left hand side menu
   * 'New' button
   * Page heading
6. Click 'New restriction type'
7. Check the name, spelling/grammar of the following elements
   * Title of the page (in the browser tab)
   * Breadcrumb
   * Page heading
8. Fill out the form and click 'Save' to create a new restriction type
   * Dialog message ('Restriction type added')
9. Click 'New restriction type'
10. Enter the same code as last time
    * Warning ('Restriction type code is already in use')
11. Click 'Cancel'
12. Click 'Edit' next to one of the types
13. Check the name, spelling/grammar of the following elements
    * Title of the page (in the browser tab)
    * Breadcrumb
    * Page heading
14. Without changing anything, click 'Save'
    * Warning ('Restriction type label is already in use')
15. Change the label and click 'Save'
    * Dialog message ('Restriction type updated')
16. Click 'Delete' next to one of the types
17. Check the name, spelling/grammar of the following elements
    * Title of the page (in the browser tab)
    * Breadcrumb
    * Page heading
    * Delete button
18. Click 'Delete this restriction type'
    * Dialog message ('Restriction type deleted')

Signed-off-by: Marius Mandrescu <marius.mandrescu@inLibro.com>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

https://bugs.koha-community.org/show_bug.cgi?id=33500
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Caroline Cyr La Rose 2023-04-17 16:58:06 -04:00 committed by Tomas Cohen Arazi
parent 72a2da381f
commit 8498c9038b
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
View file

@ -55,7 +55,7 @@
<li><a href="/cgi-bin/koha/admin/curbside_pickup.pl">Curbside pickup</a></li>
[% END %]
[% IF ( CAN_user_parameters_manage_patron_restrictions ) %]
<li><a href="/cgi-bin/koha/admin/restrictions.pl">Patron restrictions</a></li>
<li><a href="/cgi-bin/koha/admin/restrictions.pl">Patron restriction types</a></li>
[% END %]
</ul>
[% END %]

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
View file

@ -122,8 +122,8 @@
<dd>Configure curbside pickup for libraries</dd>
[% END %]
[% IF ( CAN_user_parameters_manage_patron_restrictions ) %]
<dt><a href="/cgi-bin/koha/admin/restrictions.pl">Patron restrictions</a></dt>
<dd>Define patron restrictions.</dd>
<dt><a href="/cgi-bin/koha/admin/restrictions.pl">Patron restriction types</a></dt>
<dd>Define manual patron restriction types.</dd>
[% END %]
</dl>
[% END %]

36
koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
View file

@ -4,8 +4,8 @@
[% PROCESS 'restriction-types.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>[% IF op == 'add_form' %][% IF ( restriction ) %]Modify restriction '[% PROCESS restriction_type_description restriction_type=restriction %]' &rsaquo; [% ELSE %]New restriction &rsaquo; [% END %][% END %]
[% IF op == 'delete_confirm' %]Confirm deletion of restriction '[% PROCESS restriction_type_description restriction_type=restriction %]' &rsaquo; [% END %]Patron restrictions &rsaquo; Administration &rsaquo; Koha
<title>[% IF op == 'add_form' %][% IF ( restriction ) %]Modify restriction type '[% PROCESS restriction_type_description restriction_type=restriction %]' &rsaquo; [% ELSE %]New restriction type &rsaquo; [% END %][% END %]
[% IF op == 'delete_confirm' %]Confirm deletion of restriction type '[% PROCESS restriction_type_description restriction_type=restriction %]' &rsaquo; [% END %]Patron restriction types &rsaquo; Administration &rsaquo; Koha
</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
@ -23,29 +23,29 @@
[% IF op == 'list' %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Patron restrictions</span>
<span>Patron restriction types</span>
[% END %]
[% ELSE %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/restrictions.pl">Patron restrictions</a>
<a href="/cgi-bin/koha/admin/restrictions.pl">Patron restriction types</a>
[% END %]
[% END %]
[% IF op == 'add_form' %]
[% IF restriction %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Modify restriction '[% PROCESS restriction_type_description %]'</span>
<span>Modify restriction type'[% PROCESS restriction_type_description %]'</span>
[% END %]
[% ELSE %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>New restriction</span>
<span>New restriction type</span>
[% END %]
[% END %]
[% END %]
[% IF op == 'delete_confirm' %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
<span>Delete restriction?</span>
<span>Delete restriction type?</span>
[% END %]
[% END %]
[% END #/ WRAPPER breadcrumbs %]
@ -64,9 +64,9 @@
[% CASE 'update_success' %]
Restriction type updated
[% CASE 'duplicate_display_text' %]
Another restriction already has this label
Another restriction type already has this label
[% CASE 'duplicate_code' %]
Another restriction already has this code
Another restriction type already has this code
[% CASE 'delete_success' %]
Restriction type deleted
[% CASE 'delete_default' %]
@ -84,10 +84,10 @@
<input type="hidden" name="op" value="add_validate" />
<input type="hidden" name="checked" value="0" />
[% IF restriction %]
<h1>Modify restriction [% PROCESS restriction_type_description restriction_type=restriction %]</h1>
<h1>Modify restriction type [% PROCESS restriction_type_description restriction_type=restriction %]</h1>
<input type="hidden" name="is_a_modif" value="1" />
[% ELSE %]
<h1>New restriction</h1>
<h1>New restriction type</h1>
[% END %]
<fieldset class="rows">
<ol>
@ -127,7 +127,7 @@
<form action="/cgi-bin/koha/admin/restrictions.pl" method="post">
<fieldset>
<legend>
Confirm restriction deletion
Confirm restriction type deletion
</legend>
<p>Are you sure you want to delete "[% PROCESS restriction_type_description restriction_type=restriction %]"?</p>
@ -135,7 +135,7 @@
<fieldset class="action">
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="code" value="[% restriction.code | html %]" />
<input type="submit" class="btn btn-primary" value="Delete this restriction" />
<input type="submit" class="btn btn-primary" value="Delete this restriction type" />
<a class="cancel" href="/cgi-bin/koha/admin/restrictions.pl">Cancel</a>
</fieldset>
</fieldset>
@ -145,10 +145,10 @@
[% IF op == 'list' %]
<div id="toolbar" class="btn-toolbar">
<a class="btn btn-default" id="newrestriction" href="/cgi-bin/koha/admin/restrictions.pl?op=add_form"><i class="fa fa-plus"></i> New restriction</a>
<a class="btn btn-default" id="newrestriction" href="/cgi-bin/koha/admin/restrictions.pl?op=add_form"><i class="fa fa-plus"></i> New restriction type</a>
</div>
<h1>Patron restrictions</h1>
<h1>Patron restriction types</h1>
[% IF restrictions %]
<div class="page-section">
@ -188,7 +188,7 @@
</table>
</div><!-- /.page-section -->
[% ELSE %]
<div class="dialog alert">No restrictions have been defined. <a href="/cgi-bin/koha/admin/restrictions.pl?op=add_form">Create a new restriction</a>.</div>
<div class="dialog alert">No restriction types have been defined. <a href="/cgi-bin/koha/admin/restrictions.pl?op=add_form">Create a new restriction type</a>.</div>
[% END %]
[% END %]
@ -207,8 +207,8 @@
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
<script>
var MSG_DUPLICATE_CODE = _("Restriction code is already in use");
var MSG_DUPLICATE_DISPLAY_TEXT = _("Label is already in use");
var MSG_DUPLICATE_CODE = _("Restriction type code is already in use");
var MSG_DUPLICATE_DISPLAY_TEXT = _("Restriction type label is already in use");
var existing = {
[% FOREACH ex IN existing %]
[% ex.code | $raw %]: '[% ex.display_text | $raw %]',