Attachment 25999 Details for Bug 11703 – Bug 11703 [QA Followup 10] - Fix errors caused by rebase

[patch] Bug 11703 [QA Followup 10] - Fix errors caused by rebase

Bug-11703-QA-Followup-10---Fix-errors-caused-by-re.patch (text/plain), 2.23 KB, created by Kyle M Hall (khall) on 2014-03-10 12:50:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2014-03-10 12:50:21 UTC

Size: 2.23 KB

patch

obsolete

>From 6520f270414167a10cfdd8661c6a38e467d8781d Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Mon, 10 Mar 2014 08:23:13 -0400
>Subject: [PATCH] Bug 11703 [QA Followup 10] - Fix errors caused by rebase
>
>---
> .../prog/en/modules/members/moremember.tt          |    3 ++-
> svc/checkouts.pl                                   |    4 +---
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index f70e403..062e723 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -12,9 +12,10 @@
> <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />
> <script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
> [% INCLUDE 'datatables-strings.inc' %]
>+[% INCLUDE 'datatables.inc' %]
> [% INCLUDE 'strings.inc' %]
> <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
>-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery-ui-timepicker-addon.js"></script>
>+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
> [% INCLUDE 'timepicker.inc' %]
> <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping.js"></script>
> <script type="text/javascript" src="[% themelang %]/js/checkouts.js"></script>
>diff --git a/svc/checkouts.pl b/svc/checkouts.pl
>index 6438953..ab59fb4 100755
>--- a/svc/checkouts.pl
>+++ b/svc/checkouts.pl
>@@ -99,8 +99,7 @@ else {
> }
> push( @parameters, @borrowernumber );
> 
>-$sql .= " ORDER BY ? $sorting_direction ";
>-push( @parameters, $sorting_column );
>+$sql .= " ORDER BY $sorting_column $sorting_direction ";
> 
> my $dbh = C4::Context->dbh();
> my $sth = $dbh->prepare($sql);
>@@ -117,7 +116,6 @@ while ( my $c = $sth->fetchrow_hashref() ) {
> 
>     my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
>       GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
>-
>     push(
>         @checkouts,
>         {
>-- 
>1.7.2.5

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