Bugzilla – Attachment 83194 Details for
Bug 19458
Self-check module highlighting
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Second patch of 2
0002-Bug-19458-follow-up-Self-check-module-highlighting.patch (text/plain), 7.90 KB, created by
Agustín Moyano
on 2018-12-14 03:09:16 UTC
(
hide
)
Description:
Second patch of 2
Filename:
MIME Type:
Creator:
Agustín Moyano
Created:
2018-12-14 03:09:16 UTC
Size:
7.90 KB
patch
obsolete
>From 682525dcb213020cd1669bda8fea8c483c826345 Mon Sep 17 00:00:00 2001 >From: Agustin Moyano <agustinmoyano@theke.io> >Date: Thu, 13 Dec 2018 20:01:24 -0300 >Subject: [PATCH 2/2] Bug 19458: (follow-up) Self-check module highlighting > >--- > .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 13 ++++++++++--- > opac/sco/sco-main.pl | 6 +++--- > 2 files changed, 13 insertions(+), 6 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >index 21724e31a1..8433b9260f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >@@ -84,6 +84,7 @@ > <input type="hidden" name="op" value="returnbook" /> > <input type="hidden" name="patronid" value="[% patronid | html %]" /> > <input type="hidden" name="barcode" value="[% barcode | html %]" /> >+ <input type="hidden" name="newissues" value="[% newissues | html %]" /> > <button type="submit" name="returnbook" class="btn"><i class="return"></i> Return this item</button> > </form> > [% END %] >@@ -92,6 +93,7 @@ > <input type="hidden" name="op" value="" /> > <input type="hidden" name="patronid" value="[% patronid | html %]" /> > <input type="hidden" name="barcode" value="[% barcode | html %]" /> >+ <input type="hidden" name="newissues" value="[% newissues | html %]" /> > <input type="submit" name= "confirm" value="Return to account summary" class="btn back focus" /> > </form> > </div> <!-- / .alert --> >@@ -109,6 +111,7 @@ > <input type="hidden" name="patronid" value="[% patronid | html %]" /> > <input type="hidden" name="barcode" value="[% barcode | html %]" /> > <input type="hidden" name="confirmed" value="" /> >+ <input type="hidden" name="newissues" value="[% newissues | html %]" /> > <button type="submit" name="returnbook" class="btn"><i class="icon return"></i> Return this item</button> > </form> > [% END %] >@@ -119,6 +122,7 @@ > <input type="hidden" name="patronid" value="[% patronid | html %]" /> > <input type="hidden" name="barcode" value="[% barcode | html %]" /> > <input type="hidden" name="confirmed" value="1" /> >+ <input type="hidden" name="newissues" value="[% newissues | html %]" /> > <button type="submit" name="confirm" class="btn"><i class="icon renew"></i> Renew item</button> > </form> > [% ELSE %] >@@ -127,6 +131,7 @@ > <input type="hidden" name="patronid" value="[% patronid | html %]" /> > <input type="hidden" name="barcode" value="[% barcode | html %]" /> > <input type="hidden" name="confirmed" value="1" /> >+ <input type="hidden" name="newissues" value="[% newissues | html %]" /> > <button type="submit" class="btn"><i class="icon renew"></i> Renew item</button> > </form> > [% END %] >@@ -134,6 +139,7 @@ > <form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" class="inline" method="post"> > <input type="hidden" name="op" value="" /> > <input type="hidden" name="patronid" value="[% patronid | html %]" /> >+ <input type="hidden" name="newissues" value="[% newissues | html %]" /> > <button type="submit" class="btn"><i class="icon cancel"></i> Cancel</button> > </form> > </div> >@@ -239,14 +245,14 @@ > <tr> > <td>[% ISSUE.issuedate | html %]</td> > <td> >- [% IF ( newissues.match(ISSUE.barcode)) %] >- <span class="label label-info">NEW</span> >- [% END %] > [% UNLESS ( noitemlinks ) %] > <a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE. biblionumber | uri %]">[% ISSUE.title | html %]</a> > [% ELSE %] > <strong>[% ISSUE.title | html %]</strong> > [% END %] >+ [% IF ( newissues.match(ISSUE.barcode)) %] >+ <span class="label label-info">NEW</span> >+ [% END %] > <span class="item-details">[% ISSUE.author | html %]</span> > ([% ISSUE.barcode | html %]) > </td> >@@ -260,6 +266,7 @@ > <form action="/cgi-bin/koha/sco/sco-main.pl" method="post"> > <input type="hidden" name="patronid" value="[% patronid | html %]" /> > <input type="hidden" name="barcode" value="[% ISSUE.barcode | html %]" /> >+ <input type="hidden" name="newissues" value="[% newissues | html %]" /> > [% IF ISSUE.can_be_renewed %] > <input type="hidden" name="op" value="checkout" /> > <input type="hidden" name="confirmed" value="1" /> >diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl >index 48d36e9f64..e0f09ce303 100755 >--- a/opac/sco/sco-main.pl >+++ b/opac/sco/sco-main.pl >@@ -176,6 +176,7 @@ elsif ( $patron and $op eq "checkout" ) { > if ($confirmed) { > #warn "renewing"; > AddRenewal( $borrower->{borrowernumber}, $item->{itemnumber} ); >+ push @newissueslist, $barcode; > } else { > #warn "renew confirmation"; > $template->param( >@@ -215,10 +216,10 @@ elsif ( $patron and $op eq "checkout" ) { > } > )->count; > } >+ > AddIssue( $borrower, $barcode ); > push @newissueslist, $barcode; >- print 'Issues \n'; >- print join(',', @newissueslist); >+ > if ( $hold_existed ) { > my $dtf = Koha::Database->new->schema->storage->datetime_parser; > $template->param( >@@ -248,7 +249,6 @@ elsif ( $patron and $op eq "checkout" ) { > } # $op > > if ($borrower) { >- print 'borrower \n'; > # warn "issuer's branchcode: " . $issuer->{branchcode}; > # warn "user's branchcode: " . $borrower->{branchcode}; > my $borrowername = sprintf "%s %s", ($borrower->{firstname} || ''), ($borrower->{surname} || ''); >-- >2.17.1 >
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 19458
:
83193
|
83194
|
83382
|
83383
|
83488
|
83489