Bugzilla – Attachment 145745 Details for
Bug 32730
Add patron lists tab to patron details and circulation pages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32730: (follow-up) Minor corrections
Bug-32730-follow-up-Minor-corrections.patch (text/plain), 17.71 KB, created by
Owen Leonard
on 2023-01-27 13:50:45 UTC
(
hide
)
Description:
Bug 32730: (follow-up) Minor corrections
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-01-27 13:50:45 UTC
Size:
17.71 KB
patch
obsolete
>From 32b4067bb6311e84235ba97338b2a36755090d1b Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 27 Jan 2023 13:46:42 +0000 >Subject: [PATCH] Bug 32730: (follow-up) Minor corrections > >This patch corrects an instance of an incorrect capital letter >("Patron Lists" -> "Patron lists") and makes minor tweaks to >indentation. >--- > .../modules/patron_lists/patron-lists-tab.tt | 186 +++++++++--------- > 1 file changed, 93 insertions(+), 93 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/patron-lists-tab.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/patron-lists-tab.tt >index 17878e8843..25176297e0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/patron-lists-tab.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/patron-lists-tab.tt >@@ -6,7 +6,7 @@ > > [% IF in_lists %] > <div class="patroninfo-section"> >- <h4>Patron Lists currently in</h4> >+ <h4>Patron lists currently in</h4> > > <table id="table_inlists"> > <thead> >@@ -15,7 +15,7 @@ > <th>Patrons in list</th> > <th>Shared</th> > [% IF CAN_user_tools_manage_patron_lists %] >- <th class="NoSort">Actions</th> >+ <th class="NoSort">Actions</th> > [% END %] > </tr> > </thead> >@@ -26,9 +26,9 @@ > <tr> > <td> > [% IF CAN_user_tools_manage_patron_lists %] >- <a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]">[% l.name | html %]</a> >+ <a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]">[% l.name | html %]</a> > [% ELSE %] >- [% l.name | html %] >+ [% l.name | html %] > [% END %] > </td> > <td>[% l.patron_list_patrons_rs.count || 0 | html %]</td> >@@ -42,42 +42,42 @@ > [% END %] > </td> > [% IF CAN_user_tools_manage_patron_lists %] >- <td> >- <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id | html %]" role="button" data-toggle="dropdown" href="#"> >- Actions <b class="caret"></b> >- </a> >- <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]"> >- <li><a onclick="removeFromList('[% l.patron_list_id | html %]','[% list_id_lookup.${l.patron_list_id} | html %]')"><i class="fa fa-remove"></i> Remove patron from list</a></li> >- <li class="divider"></li> >- <li><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-user"></i> Add patrons</a></li> >- [% UNLESS shared_by_other %] >- <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-pencil"></i> Edit list</a></li> >- <li><a class="delete_patron" href="/cgi-bin/koha/patron_lists/delete.pl?patron_list_id=[% l.patron_list_id | html %]" data-list-name="[% l.name | html %]"><i class="fa fa-trash"></i> Delete list</a></li> >- [% END %] >- [% IF ( l.patron_list_patrons_rs.count ) %] >+ <td> >+ <div class="btn-group dropup"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id | html %]" role="button" data-toggle="dropdown" href="#"> >+ Actions <b class="caret"></b> >+ </a> >+ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]"> >+ <li><a onclick="removeFromList('[% l.patron_list_id | html %]','[% list_id_lookup.${l.patron_list_id} | html %]')"><i class="fa fa-remove"></i> Remove patron from list</a></li> > <li class="divider"></li> >- <li> >- <a class="print_cards" href="/cgi-bin/koha/patroncards/print.pl?patronlist_id=[% l.patron_list_id | html %]" data-patron_list_id="[% l.patron_list_id | html %]"><i class="fa fa-print"></i> Print patron cards</a> >- </li> >- [% IF CAN_user_tools_edit_patrons %] >- <li> >- <a href="/cgi-bin/koha/tools/modborrowers.pl?patron_list_id=[% l.patron_list_id | uri %]&op=show"> >- <i class="fa fa-pencil"></i> Batch edit patrons >- </a> >- </li> >+ <li><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-user"></i> Add patrons</a></li> >+ [% UNLESS shared_by_other %] >+ <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-pencil"></i> Edit list</a></li> >+ <li><a class="delete_patron" href="/cgi-bin/koha/patron_lists/delete.pl?patron_list_id=[% l.patron_list_id | html %]" data-list-name="[% l.name | html %]"><i class="fa fa-trash"></i> Delete list</a></li> > [% END %] >- [% IF CAN_user_tools_delete_anonymize_patrons %] >+ [% IF ( l.patron_list_patrons_rs.count ) %] >+ <li class="divider"></li> > <li> >- <a href="/cgi-bin/koha/tools/cleanborrowers.pl?step=2&patron_list_id=[% l.patron_list_id | uri %]&checkbox=borrower"> >- <i class="fa fa-trash"></i> Batch delete patrons >- </a> >+ <a class="print_cards" href="/cgi-bin/koha/patroncards/print.pl?patronlist_id=[% l.patron_list_id | html %]" data-patron_list_id="[% l.patron_list_id | html %]"><i class="fa fa-print"></i> Print patron cards</a> > </li> >+ [% IF CAN_user_tools_edit_patrons %] >+ <li> >+ <a href="/cgi-bin/koha/tools/modborrowers.pl?patron_list_id=[% l.patron_list_id | uri %]&op=show"> >+ <i class="fa fa-pencil"></i> Batch edit patrons >+ </a> >+ </li> >+ [% END %] >+ [% IF CAN_user_tools_delete_anonymize_patrons %] >+ <li> >+ <a href="/cgi-bin/koha/tools/cleanborrowers.pl?step=2&patron_list_id=[% l.patron_list_id | uri %]&checkbox=borrower"> >+ <i class="fa fa-trash"></i> Batch delete patrons >+ </a> >+ </li> >+ [% END %] > [% END %] >- [% END %] >- </ul> >- </div> >- </td> >+ </ul> >+ </div> >+ </td> > [% END %] > </tr> > [% END %] >@@ -101,7 +101,7 @@ > <th>Patrons in list</th> > <th>Shared</th> > [% IF CAN_user_tools_manage_patron_lists %] >- <th class="NoSort">Actions</th> >+ <th class="NoSort">Actions</th> > [% END %] > </tr> > </thead> >@@ -112,9 +112,9 @@ > <tr> > <td> > [% IF CAN_user_tools_manage_patron_lists %] >- <a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]">[% l.name | html %]</a> >+ <a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]">[% l.name | html %]</a> > [% ELSE %] >- [% l.name | html %] >+ [% l.name | html %] > [% END %] > </td> > <td>[% l.patron_list_patrons_rs.count || 0 | html %]</td> >@@ -128,42 +128,42 @@ > [% END %] > </td> > [% IF CAN_user_tools_manage_patron_lists %] >- <td> >- <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id | html %]" role="button" data-toggle="dropdown" href="#"> >- Actions <b class="caret"></b> >- </a> >- <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]"> >- <li><a onclick="addToList('[% l.patron_list_id | html %]','[% cardnumber | html %]')"><i class="fa fa-plus"></i> Add patron to list</a></li> >- <li class="divider"></li> >- <li><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-user"></i> Add patrons</a></li> >- [% UNLESS shared_by_other %] >- <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-pencil"></i> Edit list</a></li> >- <li><a class="delete_patron" href="/cgi-bin/koha/patron_lists/delete.pl?patron_list_id=[% l.patron_list_id | html %]" data-list-name="[% l.name | html %]"><i class="fa fa-trash"></i> Delete list</a></li> >- [% END %] >- [% IF ( l.patron_list_patrons_rs.count ) %] >+ <td> >+ <div class="btn-group dropup"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id | html %]" role="button" data-toggle="dropdown" href="#"> >+ Actions <b class="caret"></b> >+ </a> >+ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]"> >+ <li><a onclick="addToList('[% l.patron_list_id | html %]','[% cardnumber | html %]')"><i class="fa fa-plus"></i> Add patron to list</a></li> > <li class="divider"></li> >- <li> >- <a class="print_cards" href="/cgi-bin/koha/patroncards/print.pl?patronlist_id=[% l.patron_list_id | html %]" data-patron_list_id="[% l.patron_list_id | html %]"><i class="fa fa-print"></i> Print patron cards</a> >- </li> >- [% IF CAN_user_tools_edit_patrons %] >- <li> >- <a href="/cgi-bin/koha/tools/modborrowers.pl?patron_list_id=[% l.patron_list_id | uri %]&op=show"> >- <i class="fa fa-pencil"></i> Batch edit patrons >- </a> >- </li> >+ <li><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-user"></i> Add patrons</a></li> >+ [% UNLESS shared_by_other %] >+ <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-pencil"></i> Edit list</a></li> >+ <li><a class="delete_patron" href="/cgi-bin/koha/patron_lists/delete.pl?patron_list_id=[% l.patron_list_id | html %]" data-list-name="[% l.name | html %]"><i class="fa fa-trash"></i> Delete list</a></li> > [% END %] >- [% IF CAN_user_tools_delete_anonymize_patrons %] >+ [% IF ( l.patron_list_patrons_rs.count ) %] >+ <li class="divider"></li> > <li> >- <a href="/cgi-bin/koha/tools/cleanborrowers.pl?step=2&patron_list_id=[% l.patron_list_id | uri %]&checkbox=borrower"> >- <i class="fa fa-trash"></i> Batch delete patrons >- </a> >+ <a class="print_cards" href="/cgi-bin/koha/patroncards/print.pl?patronlist_id=[% l.patron_list_id | html %]" data-patron_list_id="[% l.patron_list_id | html %]"><i class="fa fa-print"></i> Print patron cards</a> > </li> >+ [% IF CAN_user_tools_edit_patrons %] >+ <li> >+ <a href="/cgi-bin/koha/tools/modborrowers.pl?patron_list_id=[% l.patron_list_id | uri %]&op=show"> >+ <i class="fa fa-pencil"></i> Batch edit patrons >+ </a> >+ </li> >+ [% END %] >+ [% IF CAN_user_tools_delete_anonymize_patrons %] >+ <li> >+ <a href="/cgi-bin/koha/tools/cleanborrowers.pl?step=2&patron_list_id=[% l.patron_list_id | uri %]&checkbox=borrower"> >+ <i class="fa fa-trash"></i> Batch delete patrons >+ </a> >+ </li> >+ [% END %] > [% END %] >- [% END %] >- </ul> >- </div> >- </td> >+ </ul> >+ </div> >+ </td> > [% END %] > </tr> > [% END %] >@@ -173,32 +173,32 @@ > [% END %] > > <script> >-$("#table_listnopatron, #table_inlists").dataTable($.extend(true, {}, dataTablesDefaults, { >- "columnDefs": [ >- { 'sortable': false, 'targets': [ 'NoSort' ] } >- ], >- paginate: true >-})); >+ $("#table_listnopatron, #table_inlists").dataTable($.extend(true, {}, dataTablesDefaults, { >+ "columnDefs": [ >+ { 'sortable': false, 'targets': [ 'NoSort' ] } >+ ], >+ paginate: true >+ })); > >-[% IF CAN_user_tools_manage_patron_lists %] >-function addToList( list_id, cardnumber ) { >- $('#pat_lists-tab').text(_("Loading...")); >- $("body").css("cursor", "progress"); >- $('#pat_lists-tab').load('/cgi-bin/koha/patron_lists/patron-lists-tab.pl?borrowernumber=[% borrowernumber | html %]&patron_list_id=' + list_id + '&patrons_to_add=' + cardnumber, function() { >- $("body").css("cursor", "default"); >- }); >+ [% IF CAN_user_tools_manage_patron_lists %] >+ function addToList( list_id, cardnumber ) { >+ $('#pat_lists-tab').text(_("Loading...")); >+ $("body").css("cursor", "progress"); >+ $('#pat_lists-tab').load('/cgi-bin/koha/patron_lists/patron-lists-tab.pl?borrowernumber=[% borrowernumber | html %]&patron_list_id=' + list_id + '&patrons_to_add=' + cardnumber, function() { >+ $("body").css("cursor", "default"); >+ }); > >- return false; >-} >+ return false; >+ } > >-function removeFromList( list_id, patron_list_patron_id ) { >- $('#pat_lists-tab').text(_("Loading...")); >- $("body").css("cursor", "progress"); >- $('#pat_lists-tab').load('/cgi-bin/koha/patron_lists/patron-lists-tab.pl?borrowernumber=[% borrowernumber | html %]&patron_list_id=' + list_id + '&patrons_to_remove=' + patron_list_patron_id, function() { >- $("body").css("cursor", "default"); >- }); >+ function removeFromList( list_id, patron_list_patron_id ) { >+ $('#pat_lists-tab').text(_("Loading...")); >+ $("body").css("cursor", "progress"); >+ $('#pat_lists-tab').load('/cgi-bin/koha/patron_lists/patron-lists-tab.pl?borrowernumber=[% borrowernumber | html %]&patron_list_id=' + list_id + '&patrons_to_remove=' + patron_list_patron_id, function() { >+ $("body").css("cursor", "default"); >+ }); > >- return false; >-} >-[% END %] >+ return false; >+ } >+ [% END %] > </script> >-- >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 32730
:
145668
|
145710
|
145744
|
145745
|
145768
|
145977
|
146039
|
147981
|
147982
|
149477
|
154672
|
155575
|
155589
|
157992
|
158209
|
158210
|
158211