Attachment 112723 Details for Bug 26824 – Bug 26824: Use confirmation modal when removing titles from a list in the OPAC

[patch] Bug 26824: Use confirmation modal when removing titles from a list in the OPAC

Bug-26824-Use-confirmation-modal-when-removing-tit.patch (text/plain), 8.74 KB, created by Owen Leonard on 2020-10-30 15:56:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2020-10-30 15:56:21 UTC

Size: 8.74 KB

patch

obsolete

>From dd3df9854f083174e8aa0d0dd6e93229db81960d Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 26 Oct 2020 19:36:24 +0000
>Subject: [PATCH] Bug 26824: Use confirmation modal when removing titles from a
> list in the OPAC
>
>This patch changes the process of removing a title from a list so that
>it uses a confirmation modal dialog instead of a JavaScript alert.
>
>To test, apply the patch and view the contents of a list in the OPAC.
>
> - Click the "Remove from this list" link under one of the titles.
> - You should see a modal confirmation message, "Are you sure you want
>   to remove this item from the list?" It should show the title of the
>   item on the list.
> - Test both the "Yes" and "No" choices.
>
> - Check the box next to one title on the list, and click the
>   "Remove from list" link at the top of the table.
> - You should see a modal confirmation message, "Are you sure you want
>   to remove this item from the list?" It should show the title of the
>   item on the list.
> - Test boh the "Yes" and "No" choices.
>
> - Check the box next to multiple titles on the list and clcik the
>   "Remove from list" link at the top of the table.
> - You should see a modal confirmation message, "Are you sure you want
>   to remove these items from the list?" It should show the titles of
>   all the records you selected.
> - Test both the "Yes" and "No" choices.
>---
> .../bootstrap/en/includes/title-actions-menu.inc   |  2 +-
> .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 65 +++++++++++++++-------
> 2 files changed, 46 insertions(+), 21 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc
>index 124c95da4a..7a6f537cf5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc
>@@ -44,7 +44,7 @@
>         [% IF ( shelf AND op == 'view' ) %]
>             <span class="actions"><a href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% items.biblionumber | uri %]" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=[% items.biblionumber | uri %]'); return false;" class="btn btn-link btn-sm"><i class="fa fa-list" aria-hidden="true"></i> Save to another list</a></span>
>             [% IF can_remove_biblios %]
>-                <span class="actions"><a class="btn btn-link btn-sm removefromlist" href="/cgi-bin/koha/opac-shelves.pl?op=remove_biblios&amp;shelfnumber=[% shelf.shelfnumber | html %]&amp;biblionumber=[% items.biblionumber | html %]"><i class="fa fa-remove" aria-hidden="true"></i> Remove from this list</a></span>
>+                <span class="actions"><a class="btn btn-link btn-sm removeitems" data-biblionumber="[% items.biblionumber | html %]" href="/cgi-bin/koha/opac-shelves.pl?op=remove_biblios&amp;shelfnumber=[% shelf.shelfnumber | html %]&amp;biblionumber=[% items.biblionumber | html %]"><i class="fa fa-remove" aria-hidden="true"></i> Remove from this list</a></span>
>             [% END %]
>         [% ELSE %]
>             <span class="actions"><a class="addtoshelf btn btn-link btn-sm" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% items.biblionumber | html %]" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=[% items.biblionumber | html %]'); return false;"><i class="fa fa-list" aria-hidden="true"></i> Save to lists</a></span>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>index 15bf6d4f2c..c97085438c 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>@@ -369,7 +369,7 @@
>                                                     [% ELSE %]
>                                                         [% check_title = itemsloo.biblionumber %]
>                                                     [% END %]
>-                                                    <td class="select selectcol"><input type="checkbox" class="cb" name="biblionumber" value="[% itemsloo.biblionumber | html %]" aria-label="[% check_title | html %]"/></td>
>+                                                    <td class="select selectcol"><input type="checkbox" class="cb" name="biblionumber" value="[% itemsloo.biblionumber | html %]" data-title="[% itemsloo.title | html %]" aria-label="[% check_title | html %]"/></td>
>                                                     [% UNLESS ( item_level_itypes ) %]
>                                                         <td>
>                                                             [% UNLESS ( Koha.Preference('OpacNoItemTypeImages') ) %]
>@@ -558,7 +558,7 @@
>                                     <input type="hidden" name="op" value="remove_biblios" />
>                                     <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
>                                     <input type="hidden" name="modifyshelfcontents" value="1" />
>-                                    <input type="submit" value="Remove selected items" id="remove-selected" class="btn btn-danger"/>
>+                                    <input type="submit" value="Remove selected items" id="remove-selected" class="btn btn-danger removeitems"/>
>                                 [% END %]
>                             </form> 
>                         [% ELSE %]
>@@ -961,29 +961,54 @@ $(function() {
>     [% END %]
> 
>     [% IF loggedinusername && can_remove_biblios %]
>-        $(".removefromlist").on("click", function(e){
>-            return confirmDelete(MSG_REMOVE_ONE_FROM_LIST);
>-        });
> 
>-        $("#myform").submit(function(){
>-            var checkedBoxes = $(".checkboxed input:checkbox:checked");
>-            var numchecked = $(checkedBoxes).size();
>-            if (numchecked) {
>-                if( numchecked > 1 ){
>-                    return confirmDelete(MSG_REMOVE_FROM_LIST);
>+        $("body").on("click", ".removeitems", function(e){
>+            e.preventDefault();
>+            var href;
>+            var title;
>+            var yes_label;
>+            var no_label;
>+            var message = "";
>+            /* Single "Remove from list" link has a biblionumber data-attribute */
>+            if( $(this).data("biblionumber") ){
>+                /* Use the checkbox with that value to preview the title in the confirmation */
>+                var selected_titles = $(".cb[value='" + $(this).data("biblionumber") + "'");
>+                var href = $(this).attr("href");
>+            } else {
>+                var selected_titles = $(".cb:checked");
>+            }
>+            if ( selected_titles.size() < 1 ) {
>+                alert( _("No item was selected") );
>+            } else {
>+                if( selected_titles.size() > 1 ){
>+                    message = $("<ul></ul>");
>+                    title = _("Are you sure you want to remove these items from the list?");
>+                    yes_label = _("Yes, delete from list");
>+                    no_label = _("No, do not delete from list");
>+                    selected_titles.each(function(){
>+                        message.append( "<li>" +  $(this).data("title") + "</li>" );
>+                    });
>                 } else {
>-                    return confirmDelete(MSG_REMOVE_ONE_FROM_LIST);
>+                    title = _("Are you sure you want to remove this item from the list?");
>+                    yes_label = _("Yes, delete from list");
>+                    no_label = _("No, do not delete from list");
>+                    selected_titles.each(function(){
>+                        message += $(this).data("title");
>+                    });
>                 }
>-            } else {
>-                alert( __("No item was selected") );
>-                return false;
>+                confirmModal( message, title, yes_label, no_label, function( result ){
>+                    if( result ){
>+                        if( href ){
>+                            location.href= href;
>+                        } else {
>+                            $("#myform").submit();
>+                        }
>+                    }
>+                });
>             }
>         });
>-        $("#removeitems").html("<a href=\"#\" class=\"btn btn-link disabled removeitems tag_hides\"><i class=\"fa fa-fw fa-remove\" aria-hidden=\"true\"></i> "+_("Remove from list")+"</a>")
>-        .click(function(){
>-            $("#myform").submit();
>-            return false;
>-        });
>+
>+        $("#removeitems").html("<a href=\"#\" class=\"btn btn-link disabled removeitems tag_hides\"><i class=\"fa fa-fw fa-remove\" aria-hidden=\"true\"></i> "+_("Remove from list")+"</a>");
>     [% END %]
>     [% IF OpenLibraryCovers %]KOHA.OpenLibrary.GetCoverFromIsbn();[% END %]
>     [% IF OPACLocalCoverImages %]KOHA.LocalCover.GetCoverFromBibnumber(false);[% END %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 26824: 112723 | 157565 | 157582 | 158174