From 621742d4c6c9f3b8ea526ddde14fa5b46ae42721 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>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan A Gallagher <brendan@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 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 @@
                 <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 %]"><i class="fa fa-user"></i> Add patrons</a></li>
-                                    <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id %]"><i class="fa fa-edit"></i> 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 %]")'><i class="fa fa-trash"></i> 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;'><i class="fa fa-print"></i> Print patron cards</a></li>
+                                    <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id %]"><i class="fa fa-pencil"></i> 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 %]")'><i class="fa fa-trash"></i> 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;'><i class="icon-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 %]&op=show">
+                                                    <i class="fa fa-pencil"></i> Batch edit patrons</i>
+                                                </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">
+                                                    <i class="fa fa-trash"></i> Batch delete patrons</i>
+                                                </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">
-                                    <i class="fa fa-edit"></i> Edit patrons</i>
-                                </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">
-                                    <i class="fa fa-trash"></i> Delete patrons</i>
-                                </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.39.5