Attachment 159033 Details for Bug 30070 – Bug 30070: (follow-up) Further javascript fixes

[patch] Bug 30070: (follow-up) Further javascript fixes

Bug-30070-follow-up-Further-javascript-fixes.patch (text/plain), 2.93 KB, created by Martin Renvoize (ashimema) on 2023-11-16 09:43:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2023-11-16 09:43:32 UTC

Size: 2.93 KB

patch

obsolete

>From e645021a34341a4a0429d6c4e867731cb5b0d3ae Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 14 Nov 2023 14:52:51 +0000
>Subject: [PATCH] Bug 30070: (follow-up) Further javascript fixes
>
>This fixes an issue with the datatables when a message file is found to
>be missing the linked vendor or basket details.  This removes the
>datatables error: DataTables warning: table id=edi_msgs - Requested
>unknown parameter '4' for row 12, column 4.
>---
> .../prog/en/modules/acqui/edifactmsgs.tt         | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
>index 7ce04d77043..dcc1143dc8f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
>@@ -114,7 +114,13 @@
>                         "searchable": true,
>                         "orderable": true,
>                         "render": function(data, type, row, meta) {
>-                            return '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid="'+row.vendor_id+'>'+row.vendor.name+'</a>';
>+                            let link;
>+                            if ( row.vendor ) {
>+                               link = '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid='+row.vendor_id+'">'+row.vendor.name+'</a>';
>+                            } else {
>+                               link = '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid='+row.vendor_id+'">'+row.vendor_id+'</a>';
>+                            }
>+                            return link;
>                         }
>                     },
>                     {
>@@ -122,13 +128,15 @@
>                         "searchable": false,
>                         "orderable": false,
>                         "render": function(data, type, row, meta) {
>+                            let rendered = '';
>                             if ( row.type == 'QUOTE' || row.type == 'ORDERS' ) {
>-                                if ( row.basked_id ) {
>-                                    return '<a href="/cgi-bin/koha/acqui/basket.pl?basketno='+row.basked_id+'">Basket: '+row.basket_id+'</a>';
>+                                if ( row.basket_id ) {
>+                                    rendered = '<a href="/cgi-bin/koha/acqui/basket.pl?basketno='+row.basket_id+'">Basket: '+row.basket_id+'</a>';
>                                 }
>                             } else {
>-                                return '<a href="/cgi-bin/koha/acqui/invoices.pl?message_id='+row.id+'&op=do_search">Invoices</a>';
>+                                rendered = '<a href="/cgi-bin/koha/acqui/invoices.pl?message_id='+row.id+'&op=do_search">Invoices</a>';
>                             }
>+                            return rendered;
>                         }
>                     },
>                     {
>-- 
>2.41.0

Actions: View | Diff | Splinter Review

Attachments on bug 30070: 158808 | 158809 | 158810 | 158887 | 158903 | 158904 | 158905 | 158906 | 158907 | 158908 | 158909 | 158910 | 158911 | 158912 | 158913 | 158914 | 158915 | 158918 | 158920 | 158922 | 158923 | 158924 | 158925 | 158926 | 158927 | 158928 | 158929 | 158930 | 158931 | 158932 | 158933 | 158934 | 158935 | 158936 | 158937 | 158938 | 158939 | 158940 | 158941 | 158942 | 158943 | 158944 | 158945 | 158946 | 158947 | 158948 | 158949 | 158950 | 158951 | 158952 | 158953 | 158954 | 158955 | 158963 | 158964 | 158965 | 158966 | 158967 | 158968 | 158969 | 158970 | 158971 | 158972 | 158973 | 158974 | 158975 | 159026 | 159027 | 159028 | 159029 | 159030 | 159031 | 159032 | 159033 | 159034 | 159035 | 159036 | 160336 | 160337 | 160338 | 160339 | 160340 | 160341 | 160342 | 160343 | 160344 | 160345 | 160346 | 160347 | 160348