Bugzilla – Attachment 27339 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] - Change output_pref_due to output_pref
Bug-11703-QA-Followup---Change-outputprefdue-to-ou.patch (text/plain), 3.61 KB, created by
Kyle M Hall (khall)
on 2014-04-21 11:04:45 UTC
(
hide
)
Description:
Bug 11703 [QA Followup] - Change output_pref_due to output_pref
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-04-21 11:04:45 UTC
Size:
3.61 KB
patch
obsolete
>From f554ef4f70c73d62a7381f8a94297a026ee9b8ea Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Mon, 21 Apr 2014 06:55:45 -0400 >Subject: [PATCH] Bug 11703 [QA Followup] - Change output_pref_due to output_pref > >--- > svc/checkin.pl | 2 -- > svc/checkouts.pl | 10 +++++++--- > svc/holds.pl | 15 +++++++++------ > svc/renew.pl | 4 ++-- > 4 files changed, 18 insertions(+), 13 deletions(-) > >diff --git a/svc/checkin.pl b/svc/checkin.pl >index a303e52..000ddbc 100755 >--- a/svc/checkin.pl >+++ b/svc/checkin.pl >@@ -27,8 +27,6 @@ use C4::Items qw(GetBarcodeFromItemnumber); > use C4::Context; > use C4::Auth qw(check_cookie_auth); > >-use Koha::DateUtils qw(output_pref_due); >- > my $input = new CGI; > > my ( $auth_status, $sessionID ) = >diff --git a/svc/checkouts.pl b/svc/checkouts.pl >index ab59fb4..ed4d0ff 100755 >--- a/svc/checkouts.pl >+++ b/svc/checkouts.pl >@@ -103,7 +103,7 @@ $sql .= " ORDER BY $sorting_column $sorting_direction "; > > my $dbh = C4::Context->dbh(); > my $sth = $dbh->prepare($sql); >-$sth->execute( @parameters ); >+$sth->execute(@parameters); > > my $item_level_itypes = C4::Context->preference('item-level_itypes'); > >@@ -142,8 +142,12 @@ while ( my $c = $sth->fetchrow_hashref() ) { > renewals_remaining => $renewals_remaining, > issuedate_formatted => > output_pref( dt_from_string( $c->{issuedate} ) ), >- date_due_formatted => >- output_pref_due( dt_from_string( $c->{date_due} ) ), >+ date_due_formatted => output_pref( >+ { >+ dt => dt_from_string( $c->{date_due} ), >+ as_due_date => 1 >+ } >+ ), > subtitle => GetRecordValue( > 'subtitle', > GetMarcBiblio( $c->{biblionumber} ), >diff --git a/svc/holds.pl b/svc/holds.pl >index 9fbdb5f..9cd1406 100755 >--- a/svc/holds.pl >+++ b/svc/holds.pl >@@ -95,14 +95,17 @@ while ( my $h = $holds_rs->next() ) { > 'subtitle', GetMarcBiblio($biblionumber), > GetFrameworkCode($biblionumber) > ), >- reservedate_formatted => $h->reservedate() >- ? output_pref_due( dt_from_string( $h->reservedate() ) ) >+ reservedate_formatted => $h->reservedate() ? output_pref( >+ { dt => dt_from_string( $h->reservedate() ), as_due_date => 1 } >+ ) > : q{}, >- suspend_until_formatted => $h->suspend_until() >- ? output_pref_due( dt_from_string( $h->suspend_until() ) ) >+ suspend_until_formatted => $h->suspend_until() ? output_pref( >+ { dt => dt_from_string( $h->suspend_until() ), as_due_date => 1 } >+ ) > : q{}, >- expirationdate_formatted => $h->expirationdate() >- ? output_pref_due( dt_from_string( $h->expirationdate() ) ) >+ expirationdate_formatted => $h->expirationdate() ? output_pref( >+ { dt => dt_from_string( $h->expirationdate() ), as_due_date => 1 } >+ ) > : q{}, > }; > >diff --git a/svc/renew.pl b/svc/renew.pl >index add9e9f..fa8475a 100755 >--- a/svc/renew.pl >+++ b/svc/renew.pl >@@ -26,7 +26,7 @@ use C4::Circulation; > use C4::Context; > use C4::Auth qw(check_cookie_auth); > >-use Koha::DateUtils qw(output_pref_due dt_from_string); >+use Koha::DateUtils qw(output_pref dt_from_string); > > my $input = new CGI; > >@@ -63,7 +63,7 @@ $data->{branchcode} = $branchcode; > > if ( $data->{renew_okay} ) { > $date_due = AddRenewal( $borrowernumber, $itemnumber, $branchcode, $date_due ); >- $data->{date_due} = output_pref_due( $date_due ); >+ $data->{date_due} = output_pref( { dt => $date_due, as_due_date => 1 } ); > } > > print to_json($data); >-- >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