Bugzilla – Attachment 27350 Details for
Bug 11703
Convert checkouts table to ajax datatable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11703 [QA Followup] - Fix up holds table details
Bug-11703-QA-Followup---Fix-up-holds-table-details.patch (text/plain), 5.43 KB, created by
Kyle M Hall (khall)
on 2014-04-21 13:50:29 UTC
(
hide
)
Description:
Bug 11703 [QA Followup] - Fix up holds table details
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-04-21 13:50:29 UTC
Size:
5.43 KB
patch
obsolete
>From 21dad005876f67a9ec631fb40ff131a55c56ffc3 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Mon, 21 Apr 2014 09:49:55 -0400 >Subject: [PATCH] Bug 11703 [QA Followup] - Fix up holds table details > >--- > koha-tmpl/intranet-tmpl/prog/en/js/holds.js | 26 ++++++++++++-------------- > svc/holds.pl | 8 ++++---- > 2 files changed, 16 insertions(+), 18 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js >index 76dfee5..a1279c8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/js/holds.js >@@ -4,6 +4,7 @@ $(document).ready(function() { > $("#holds-tab").click( function() { > if ( ! holdsTable ) { > holdsTable = $("#holds-table").dataTable({ >+ "bAutoWidth": false, > "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t", > "aoColumns": [ > { >@@ -11,7 +12,7 @@ $(document).ready(function() { > }, > { > "mDataProp": function ( oObj ) { >- title = "<a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber=" >+ title = "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" > + oObj.biblionumber > + "'>" > + oObj.title; >@@ -34,17 +35,6 @@ $(document).ready(function() { > title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>" > } > >- title += " " >- + "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=" >- + oObj.biblionumber >- + "&itemnumber=" >- + oObj.itemnumber >- + "#" >- + oObj.itemnumber >- + "'>" >- + oObj.barcode >- + "</a>"; >- > return title; > } > }, >@@ -74,13 +64,20 @@ $(document).ready(function() { > data += " " + AT + " " + oObj.waiting_at; > } > } else if ( oObj.transferred ) { >- data += ITEM_IS + " <strong> " + IN_TRANSIT + " </strong> " + FROM + oObj.from_branch; >+ data += ITEM_IS + " <strong> " + IN_TRANSIT + " </strong> " + FROM + " " + oObj.from_branch; > } else if ( oObj.not_transferred ) { > data += NOT_TRANSFERRED_YET + " " + oObj.not_transferred_by; > } data += "</em>"; > > data += " <a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber=" >- + oObj.biblionumber + "'>" + oObj.barcode + "</a>"; >+ + oObj.biblionumber >+ + "&itemnumber=" >+ + oObj.itemnumber >+ + "#" >+ + oObj.itemnumber >+ + "'>" >+ + oObj.barcode >+ + "</a>"; > } > > return data; >@@ -97,6 +94,7 @@ $(document).ready(function() { > } > }, > { >+ "bSortable": false, > "mDataProp": function( oObj ) { > return "<select name='rank-request'>" > + "<option value='n'>" + NO + "</option>" >diff --git a/svc/holds.pl b/svc/holds.pl >index 9cd1406..85e0f5b 100755 >--- a/svc/holds.pl >+++ b/svc/holds.pl >@@ -96,15 +96,15 @@ while ( my $h = $holds_rs->next() ) { > GetFrameworkCode($biblionumber) > ), > reservedate_formatted => $h->reservedate() ? output_pref( >- { dt => dt_from_string( $h->reservedate() ), as_due_date => 1 } >+ { dt => dt_from_string( $h->reservedate() ), dateonly => 1 } > ) > : q{}, > suspend_until_formatted => $h->suspend_until() ? output_pref( >- { dt => dt_from_string( $h->suspend_until() ), as_due_date => 1 } >+ { dt => dt_from_string( $h->suspend_until() ), dateonly => 1 } > ) > : q{}, > expirationdate_formatted => $h->expirationdate() ? output_pref( >- { dt => dt_from_string( $h->expirationdate() ), as_due_date => 1 } >+ { dt => dt_from_string( $h->expirationdate() ), dateonly => 1 } > ) > : q{}, > }; >@@ -123,7 +123,7 @@ while ( my $h = $holds_rs->next() ) { > if ($transferred_when) { > $hold->{color} = 'transferred'; > $hold->{transferred} = 1; >- $hold->{date_sent} = format_date($transferred_when); >+ $hold->{date_sent} = output_pref( dt_from_string($transferred_when) ); > $hold->{from_branch} = GetBranchName($transferred_from); > } > elsif ( $item->holdingbranch()->branchcode() ne >-- >1.7.2.5
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 11703
:
25105
|
25110
|
25111
|
25213
|
25217
|
25218
|
25220
|
25221
|
25261
|
25262
|
25263
|
25264
|
25271
|
25272
|
25289
|
25290
|
25292
|
25390
|
25391
|
25986
|
25987
|
25988
|
25989
|
25990
|
25991
|
25992
|
25993
|
25994
|
25995
|
25996
|
25997
|
25998
|
25999
|
26081
|
26085
|
26115
|
26131
|
26158
|
26160
|
26241
|
26986
|
26990
|
26991
|
27102
|
27241
|
27338
|
27339
|
27340
|
27341
|
27342
|
27349
|
27350
|
27353
|
27354
|
27356
|
27548
|
27610
|
27717
|
27718
|
27745
|
27746
|
27750
|
27751
|
28025
|
28026
|
28027
|
28028
|
28029
|
29195
|
29196
|
29197
|
29198
|
29199
|
29279
|
29280
|
29281
|
29282
|
29283
|
29284
|
29419
|
29420
|
29432
|
29433
|
29434
|
29438
|
29439
|
29440
|
29444
|
29445
|
29446
|
29447
|
29448
|
29449
|
29450
|
29451
|
29452
|
29453
|
29454
|
29472
|
29473
|
29474
|
29475
|
29476
|
29477
|
29478
|
29479
|
29480
|
29493
|
30228