Attachment 49597 Details for Bug 10612 – Bug 10612 [Follow-up] Combine and clarify menu items

[patch] Bug 10612 [Follow-up] Combine and clarify menu items

Bug-10612-Follow-up-Combine-and-clarify-menu-items.patch (text/plain), 6.51 KB, created by Nick Clemens (kidclamp) on 2016-03-25 18:34:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2016-03-25 18:34:41 UTC

Size: 6.51 KB

patch

obsolete

>From 3d01a2facd9b571bc6d3619038ca44fe59c105b1 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 9 Mar 2016 11:48:39 -0500
>Subject: [PATCH] Bug 10612 [Follow-up] Combine and clarify menu items
>
>This follow-up patch for Bug 10612 moves all list operations into one
>menu while (hopefully) clarifying the labels for each.
>
>Also in this patch: Changed datatables sorting configuration to use the
>"nosort" attribute.
>
>To test, apply the patch and go to Tools -> Patron lists.
>
>- On a patron list with no patrons, confirm that the "Actions"
> menu lists "Add patrons," "Edit list," and "Delete list."
>- On a patron list containing one or more patrons, confirm that the
> "Actions" menu /also/ has these options: "Print patron cards," "Batch
> edit patrons," and "Batch delete patrons."
>- Confirm that the "actions" column is not sortable.
>- Test logging in as a user who has various combinations of permission
> to batch edit and batch delete.
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> .../prog/en/modules/patron_lists/lists.tt | 49 ++++++++++------------
> 1 file changed, 23 insertions(+), 26 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>index 14ce99a..6262d94 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>@@ -11,7 +11,7 @@
> $('#patron-lists-table').dataTable($.extend(true, {}, dataTablesDefaults, {
> "autoWidth": false,
> "aoColumnDefs": [
>- { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
>+ { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] }
> ],
> "sPaginationType": "four_button"
> } ));
>@@ -50,13 +50,7 @@
> <tr>
> <th>Name</th>
> <th>Patrons in list</th>
>- <th>&nbsp;</th>
>- [% IF CAN_user_tools_edit_patrons %]
>- <th>&nbsp;</th>
>- [% END %]
>- [% IF CAN_user_tools_delete_anonymize_patrons %]
>- <th>&nbsp;</th>
>- [% END %]
>+ <th class="NoSort">&nbsp;</th>
> </tr>
> </thead>
> 
>@@ -72,26 +66,29 @@
> </a>
> <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id %]">
> <li><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id %]"> Add patrons</a></li>
>- <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id %]"> Edit</a></li>
>- <li><a href="/cgi-bin/koha/patron_lists/delete.pl?patron_list_id=[% l.patron_list_id %]" onclick='return ConfirmDelete("[% l.name %]")'> Delete</a></li>
>- <li><a href="#" onclick='GB_showCenter(_("Print patron cards from list"), "/cgi-bin/koha/patroncards/print.pl?patronlist_id=[% l.patron_list_id %]", 400, 800);return false;'> Print patron cards</a></li>
>+ <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id %]"> Edit list</a></li>
>+ <li><a href="/cgi-bin/koha/patron_lists/delete.pl?patron_list_id=[% l.patron_list_id %]" onclick='return ConfirmDelete("[% l.name %]")'> Delete list</a></li>
>+ [% IF ( l.patron_list_patrons_rs.count ) %]
>+ <li class="divider"></li>
>+ <li><a href="#" onclick='GB_showCenter(_("Print patron cards from list"), "/cgi-bin/koha/patroncards/print.pl?patronlist_id=[% l.patron_list_id %]", 400, 800);return false;'> 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 %]&op=show">
>+ 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 %]&checkbox=borrower">
>+ Batch delete patrons
>+ </a>
>+ </li>
>+ [% END %]
>+ [% END %]
> </ul>
> </div>
> </td>
>- [% IF CAN_user_tools_edit_patrons %]
>- <td>
>- <a class="btn btn-mini" href="/cgi-bin/koha/tools/modborrowers.pl?patron_list_id=[% l.patron_list_id %]&op=show">
>- Edit patrons
>- </a>
>- </td>
>- [% END %]
>- [% IF CAN_user_tools_delete_anonymize_patrons %]
>- <td>
>- <a class="btn btn-mini" href="/cgi-bin/koha/tools/cleanborrowers.pl?step=2&patron_list_id=[% l.patron_list_id %]&checkbox=borrower">
>- Delete patrons
>- </a>
>- </td>
>- [% END %]
> </tr>
> [% END %]
> </tbody>
>@@ -106,4 +103,4 @@
> [% INCLUDE 'tools-menu.inc' %]
> </div>
> </div>
>-[% INCLUDE 'intranet-bottom.inc' %]
>\ No newline at end of file
>+[% INCLUDE 'intranet-bottom.inc' %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 10612: 19766 | 19767 | 21081 | 21444 | 21445 | 21446 | 22837 | 22838 | 28779 | 28780 | 36311 | 36313 | 36314 | 36315 | 41289 | 41363 | 41364 | 41365 | 46239 | 46279 | 46280 | 46834 | 47153 | 47224 | 47225 | 47226 | 47255 | 47259 | 47393 | 47394 | 47395 | 47396 | 47478 | 48833 | 48881 | 48888 | 48890 | 48891 | 48892 | 49596 | 49597 | 49607 | 49694 | 49740 | 49741 | 49766 | 49767 | 49768 | 49769 | 49770