From 621742d4c6c9f3b8ea526ddde14fa5b46ae42721 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher --- .../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 14ce99a4fe..6262d94a4c 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 @@ Name Patrons in list -   - [% IF CAN_user_tools_edit_patrons %] -   - [% END %] - [% IF CAN_user_tools_delete_anonymize_patrons %] -   - [% END %] +   @@ -72,26 +66,29 @@ - [% IF CAN_user_tools_edit_patrons %] - - - Edit patrons - - - [% END %] - [% IF CAN_user_tools_delete_anonymize_patrons %] - - - Delete patrons - - - [% END %] [% END %] @@ -106,4 +103,4 @@ [% INCLUDE 'tools-menu.inc' %] -[% INCLUDE 'intranet-bottom.inc' %] \ No newline at end of file +[% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5