Attachment 49870 Details for Bug 15832 – [SIGNED-OFF] Bug 15832 - Fix filter and items split-up in pendingreserves.tt

[patch] [SIGNED-OFF] Bug 15832 - Fix filter and items split-up in pendingreserves.tt

SIGNED-OFF-Bug-15832---Fix-filter-and-items-split-.patch (text/plain), 2.03 KB, created by Owen Leonard on 2016-04-04 18:12:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2016-04-04 18:12:00 UTC

Size: 2.03 KB

patch

obsolete

>From be6269f20f594c02357ec7364c83a980ab3a7f18 Mon Sep 17 00:00:00 2001
>From: Alex Arnaud <alex.arnaud@biblibre.com>
>Date: Tue, 16 Feb 2016 16:33:17 +0100
>Subject: [PATCH] [SIGNED-OFF] Bug 15832 - Fix filter and items split-up in
> pendingreserves.tt
>Content-Type: text/plain; charset="utf-8"
>
>Test plan:
>
>- Go to circ/pendingreserves.pl (Ensure that there are biblios with many
>  items on different branches),
>- Check the libraries filter at the bottom of datatable. There should be
>  duplicates.
>- Apply this patch and return to circ/pendingreserves.pl,
>- check that libraries filter should not contain duplicate,
>- check that the filter works.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>index 919f0c3..46f3088 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>@@ -28,9 +28,10 @@ $(document).ready(function() {
>     for ( j=0 ; j<cD.length ; j++ ) {
>         var split_array = cD[j].split(/<br>/gi);
>         for ( k=0 ; k<split_array.length ; k++ ){
>-            var check_array = $.inArray(split_array[k], new_array);
>+            var str = $.trim(split_array[k].replace(/[\n\r]/g, ''));
>+            var check_array = $.inArray(str, new_array);
>             if (check_array == -1) {
>-                new_array.push(split_array[k]);
>+                new_array.push(str);
>             }
>         }
>     }
>@@ -50,9 +51,6 @@ $(document).ready(function() {
>       $(this).html( createSelect( holdst.fnGetColumnData(4) ) );
>       $('select', this).change( function () {
>           var filter_value = $(this).val();
>-          if(filter_value){
>-                filter_value = "(^|>)"+filter_value+"($|<)";
>-          }
>           holdst.fnFilter( filter_value, 4, true );
>       } );
>   } );
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 15832: 48141 | 48497 | 48694 | 49682 | 49870 | 49892 | 49893