Attachment 101915 Details for Bug 20936 – Bug 20936: (follow-up) use modified by bug 24980, fix display of page info and fix search without enter

[patch] Bug 20936: (follow-up) use modified by bug 24980, fix display of page info and fix search without enter

Bug-20936-follow-up-use-modified-by-bug-24980-fix-.patch (text/plain), 2.32 KB, created by Agustín Moyano on 2020-03-26 21:50:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Agustín Moyano

Created: 2020-03-26 21:50:19 UTC

Size: 2.32 KB

patch

obsolete

>From dac1236694cbc955e58f8369cffe14b3ef5d768d Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Thu, 26 Mar 2020 21:48:40 +0000
>Subject: [PATCH] Bug 20936: (follow-up) use  modified by bug 24980, fix
> display of page info and fix search without enter
>
>---
> .../bootstrap/en/modules/opac-holdsrecord.tt      | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdsrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdsrecord.tt
>index b68dcbe190..ec997f75d5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdsrecord.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdsrecord.tt
>@@ -156,7 +156,12 @@
>                     }
>                 },
>                 {"data": "branch.name"},
>-                {"data": "hold_date"},
>+                {
>+                    "data": "hold_date",
>+                    "render": function(data, type, row, meta) {
>+                        return (data&&$date(data))||'';
>+                    }
>+                },
>                 {
>                     "data": "expiration_date",
>                     "render": function(data, type, row, meta) {
>@@ -191,13 +196,13 @@
> 
>         table.on('draw.dt', function(event, settings) {
>             var page_info = table.page.info();
>-            $(".controls .info").html(_("Showing page %s of %s").format(page_info.page+1, page_info.pages));
>-            if(!page_info.page) {
>+            $(".controls .info").html(page_info.pages?_("Showing page %s of %s").format(page_info.page+1, page_info.pages):'');
>+            if(!page_info.page||!page_info.pages) {
>                 $('.controls .previous').addClass('disabled');
>             } else {
>                 $('.controls .previous').removeClass('disabled');
>             }
>-            if(page_info.pages-1===page_info.page) {
>+            if(page_info.pages-1===page_info.page||!page_info.pages) {
>                 $('.controls .next').addClass('disabled');
>             } else {
>                 $('.controls .next').removeClass('disabled');
>@@ -226,7 +231,7 @@
>             };
>         };
> 
>-        $(".controls .search").keypress(debounce(function(event) {
>+        $(".controls .search").keyup(debounce(function(event) {
>             table.search(this.value).draw();
>         }, 300));
>     });
>-- 
>2.25.0

Actions: View | Diff | Splinter Review

Attachments on bug 20936: 98629 | 98630 | 100115 | 100116 | 100117 | 100205 | 100206 | 100207 | 100471 | 100472 | 100473 | 100474 | 101724 | 101725 | 101726 | 101727 | 101772 | 101915 | 102166 | 103948 | 103949 | 103950 | 103951 | 104040 | 104041 | 104466 | 104467 | 105131 | 112667 | 112668 | 112730 | 112731 | 112732 | 112733 | 113446 | 113447 | 113448 | 113449