Bugzilla – Attachment 32982 Details for
Bug 10860
On-site checkouts (was In-House Use)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10860 [QA Followup] - Fix misc issues
Bug-10860-QA-Followup---Fix-misc-issues.patch (text/plain), 6.21 KB, created by
Kyle M Hall (khall)
on 2014-10-30 16:03:06 UTC
(
hide
)
Description:
Bug 10860 [QA Followup] - Fix misc issues
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-10-30 16:03:06 UTC
Size:
6.21 KB
patch
obsolete
>From 767e2fecd4b1c3ae4d43e48ceffdd6eb5aa57112 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Wed, 22 Oct 2014 02:18:03 -0400 >Subject: [PATCH] Bug 10860 [QA Followup] - Fix misc issues > >--- > C4/Circulation.pm | 5 ++--- > koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 10 +++++----- > .../prog/en/modules/circ/circulation.tt | 2 +- > .../prog/en/modules/members/readingrec.tt | 13 ++++++------- > t/db_dependent/Circulation.t | 2 +- > 5 files changed, 15 insertions(+), 17 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index e5619de..7ec5c5e 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -1189,11 +1189,10 @@ AddIssue does the following things : > > sub AddIssue { > my ( $borrower, $barcode, $datedue, $cancelreserve, $issuedate, $sipmode, $params ) = @_; >- my $onsite_checkout = $params->{onsite_checkout}; >- my $auto_renew = $params->{auto_renew}; >+ my $onsite_checkout = $params && $params->{onsite_checkout} ? 1 : 0; >+ my $auto_renew = $params && $params->{auto_renew}; > my $dbh = C4::Context->dbh; > my $barcodecheck=CheckValidBarcode($barcode); >- $onsite_checkout = ( $onsite_checkout ? 1 : 0 ); > > if ($datedue && ref $datedue ne 'DateTime') { > $datedue = dt_from_string($datedue); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js >index 65dab64..e333776 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js >@@ -307,11 +307,11 @@ $(document).ready(function() { > span_class = "renewals-allowed"; > } > >- content += "<span class='" + span_class + "' style='" + span_style + "'>" >- + "<input type='checkbox' class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>" >- + "</span>"; >+ if ( oObj.renewals_remaining && oObj.onsite_checkout == 0 ) { >+ content += "<span class='" + span_class + "' style='" + span_style + "'>" >+ + "<input type='checkbox' class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>" >+ + "</span>"; > >- if ( oObj.renewals_remaining && onsite_checkout == 0 ) { > content += "<span class='renewals'>(" > + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed ) > + ")</span>"; >@@ -444,7 +444,7 @@ $(document).ready(function() { > > var onsite_checkout = ''; > if ( oObj.onsite_checkout == 1 ) { >- onsite_checkout += " <span class='onsite_checkout'>("+INHOUSE_USE+")</span>"; >+ onsite_checkout += " <span class='onsite_checkout'>(" + INHOUSE_USE + ")</span>"; > } > > title += " " >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 8513a16..e439cb5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -533,7 +533,7 @@ No patron matched <span class="ex">[% message %]</span> > <button class="btn btn-small action" id="cleardate" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" >Clear</button> > </div>[% END %] > >- [% IF onsite_checkout_feature %] >+ [% IF Koha.Preference('On-site checkouts') %] > <div class="onsite_checkout-select"> > [% IF noissues %] > <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkout</label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index 33823a2..53e7373 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -17,11 +17,11 @@ > ] > })); > var tabs = $("#tabs").tabs({ >- select: function(e, ui) { >- var id = $(ui.tab).attr("id"); >- if ( id == "tab_checkout" ) { >- table.fnFilter("checkout", 0); >- } else if ( id == "tab_onsite_checkout" ) { >+ activate: function(e, ui) { >+ var active = tabs.tabs("option", "active" ); >+ if ( active == 1 ) { >+ table.fnFilter("standard_checkout", 0); >+ } else if ( active == 2 ) { > table.fnFilter("onsite_checkout", 0); > } else { // all > table.fnFilter('', 0); >@@ -82,7 +82,7 @@ > [% IF issue.onsite_checkout %] > onsite_checkout > [% ELSE %] >- checkout >+ standard_checkout > [% END %] > </td> > <td> >@@ -105,7 +105,6 @@ > <td> > <span title="[% issue.issuedate %]">[% issue.issuedate | $KohaDates %]</span></td> > </td> >- <td>[% issue.issuedate | $KohaDates %]</td> > <td>[% issue.issuingbranch %]</td> > <td> > [% IF issue.date_due %] >diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t >index 1740795..494a841 100755 >--- a/t/db_dependent/Circulation.t >+++ b/t/db_dependent/Circulation.t >@@ -338,7 +338,7 @@ C4::Context->dbh->do("DELETE FROM accountlines"); > $biblionumber > ); > >- AddIssue( $renewing_borrower, $barcode4, undef, undef, undef, undef, 1 ); >+ AddIssue( $renewing_borrower, $barcode4, undef, undef, undef, undef, { auto_renew => 1 } ); > ( $renewokay, $error ) = > CanBookBeRenewed( $renewing_borrowernumber, $itemnumber4 ); > is( $renewokay, 0, 'Cannot renew, renewal is automatic' ); >-- >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 10860
:
20959
|
20960
|
20961
|
21195
|
21642
|
22461
|
26089
|
26114
|
26123
|
26185
|
26191
|
26192
|
31388
|
31507
|
31548
|
31664
|
31665
|
32213
|
32214
|
32216
|
32223
|
32579
|
32580
|
32581
|
32954
|
32979
|
32980
|
32981
|
32982
|
32983
|
32984
|
32997
|
32998
|
33031
|
33032
|
33033
|
33034
|
33035
|
33036
|
33037
|
33105
|
33106
|
33107
|
33108
|
33109
|
33110
|
33111
|
33163
|
33165