Bugzilla – Attachment 75712 Details for
Bug 20726
Display acquisition details on the subscription detail page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20726: Add show/hide already received orders links
Bug-20726-Add-showhide-already-received-orders-lin.patch (text/plain), 3.58 KB, created by
Séverine Queune
on 2018-05-31 16:02:13 UTC
(
hide
)
Description:
Bug 20726: Add show/hide already received orders links
Filename:
MIME Type:
Creator:
Séverine Queune
Created:
2018-05-31 16:02:13 UTC
Size:
3.58 KB
patch
obsolete
>From 1f3eddff86418bdc849563c72b1736b69a143231 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 29 May 2018 16:59:05 -0300 >Subject: [PATCH] Bug 20726: Add show/hide already received orders links >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> >--- > .../prog/en/modules/serials/subscription-detail.tt | 21 +++++++++++++++++++-- > koha-tmpl/intranet-tmpl/prog/js/datatables.js | 6 +++++- > 2 files changed, 24 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index 771d363..6a02066 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -334,6 +334,12 @@ > <div id="acquisition_details"> > <h2>Acquisition details</h2> > <table id="orders"> >+ <caption> >+ <span class="actions"> >+ <a href="#" id="hide_received_orders">Hide already received orders</a> >+ | <a href="#" id="show_all_orders">Show all orders</a></span> >+ </caption> >+ > <thead> > <tr> > <th>Invoice</th> >@@ -367,7 +373,7 @@ > [% END %]</td> > <td>[% order.ordernumber %]</td> > <td><span title="[% order.basket.creationdate %]">[% order.basket.creationdate | $KohaDates%]</span></td> >- <td><span title="[% order.datereceived %]">[% order.datereceived | $KohaDates%]</span></td> >+ <td>[% IF order.datereceived %]<span title="[% order.datereceived %]">[% order.datereceived | $KohaDates %]</span>[% END %]</td> > <td> > [% SWITCH order.orderstatus %] > [% CASE 'new' %]New >@@ -424,7 +430,7 @@ > return false; > }) > >- $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, { >+ var table = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, { > 'bPaginate': false, > 'bAutoWidth': false, > "aaSorting": [[ 4, "desc" ]], >@@ -433,6 +439,17 @@ > ] > })); > >+ $("#hide_received_orders").click(function(e){ >+ e.preventDefault(); >+ table.fnFilter( '.', 4, true ); // Not empty "Receive date" columns >+ }); >+ $("#show_all_orders").click(function(e){ >+ e.preventDefault(); >+ table.fnFilter( '', 4 ); // Not filter, display all columns >+ }); >+ $("#show_all_orders").click(); >+ >+ > }); > </script> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js >index 9c3caf1..f8d23b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js >@@ -371,7 +371,11 @@ jQuery.extend( jQuery.fn.dataTableExt.oSort, { > */ > jQuery.extend( jQuery.fn.dataTableExt.oSort, { > "title-string-pre": function ( a ) { >- return a.match(/title="(.*?)"/)[1].toLowerCase(); >+ var m = a.match(/title="(.*?)"/); >+ if ( null !== m && m.length ) { >+ return m[1].toLowerCase(); >+ } >+ return ""; > }, > > "title-string-asc": function ( a, b ) { >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20726
:
75146
|
75147
|
75148
|
75149
|
75150
|
75650
|
75651
|
75666
|
75708
|
75709
|
75710
|
75711
|
75712
|
75713
|
75794
|
77428
|
77429
|
77430
|
77431
|
77432
|
77433
|
77434
|
77500
|
77501
|
77502
|
77503
|
77504
|
77505
|
77506
|
78062
|
78063
|
78064
|
78065
|
78066
|
78067
|
78068