Bugzilla – Attachment 161723 Details for
Bug 22322
Self-checkin module should provide for automatic logins (like self-checkout)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22322: Fix QA issues
0002-Bug-22322-Fix-QA-issues.patch (text/plain), 4.14 KB, created by
Emmi Takkinen
on 2024-02-02 10:24:58 UTC
(
hide
)
Description:
Bug 22322: Fix QA issues
Filename:
MIME Type:
Creator:
Emmi Takkinen
Created:
2024-02-02 10:24:58 UTC
Size:
4.14 KB
patch
obsolete
>From bb8d773e172ab4bf7231fc5a111e106656d4c83d Mon Sep 17 00:00:00 2001 >From: Emmi Takkinen <emmi.takkinen@koha-suomi.fi> >Date: Fri, 11 Nov 2022 10:40:30 +0200 >Subject: [PATCH 2/2] Bug 22322: Fix QA issues > >This patch fixes following QA issues: >- Add missing filters >- Use dt_from_string instead of DateTime->now in sco-main.pl > >Following issue is left unchanged, since it is purposeful: >forbidden pattern: Script permissions is authnotrequired => 0, >it could be correct for an OPAC script if it is was you really want error > >Sponsored-by: Koha-Suomi Oy >Signed-off-by: hinemoea <hinemoea@inlibro.com> >--- > .../opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 6 +++--- > opac/sco/sco-main.pl | 2 +- > 3 files changed, 6 insertions(+), 6 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc >index c6be929d7e..bd02a8a011 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc >@@ -4,7 +4,7 @@ > <div class="navbar navbar-inverse navbar-static-top navbar-black"> > <div class="navbar-inner navbar-black"> > <div class="container-fluid navbar-black"> >- <a class="brand" href="/cgi-bin/koha/sco/sco-main.pl"><img src="[% interface %]/[% theme %]/images/koha-logo-navbar.png" alt=""></a> >+ <a class="brand" href="/cgi-bin/koha/sco/sco-main.pl"><img src="[% interface | html %]/[% theme | html %]/images/koha-logo-navbar.png" alt=""></a> > <div id="checkouthelp"> > <ul class="nav pull-right"> > <li><a href="/cgi-bin/koha/sco/help.pl"><i class="icon help"></i> Help</a></li> >@@ -28,7 +28,7 @@ > <div class="container-fluid"> > <div class="row-fluid"> > <div id="opacheader"> >- [% opacheader %] >+ [% opacheader | html %] > </div> > </div> > </div> >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 278ef8c232..e9c40f8b3a 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 >@@ -525,7 +525,7 @@ > </div> <!-- / .row --> > [% END # / IF validuser %] > [% END # / UNLESS ( hide_main %] >- <b>[% checkinmessage %]</b> >+ <b>[% checkinmessage | html %]</b> > [% IF ( SCOMainUserBlock ) %] > <div id="scomainuserblock"> > [% PROCESS koha_news_block news => SCOMainUserBlock %] >@@ -663,8 +663,8 @@ > [% IF Koha.Preference('SelfCheckReceiptPrompt') %] > var confirmStart = Date.now(); > if(confirm(_("Would you like to print a receipt?"))){ >- if ( (Date.now() - confirmStart) < [% SelfCheckTimeout %] ) { >- window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber %]&print=qslip"); >+ if ( (Date.now() - confirmStart) < [% SelfCheckTimeout | html %] ) { >+ window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber | uri %]&print=qslip"); > } > else { > alert(_("Timeout while waiting for print confirmation")); >diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl >index 77e3a7ccda..8ffac588ac 100755 >--- a/opac/sco/sco-main.pl >+++ b/opac/sco/sco-main.pl >@@ -133,7 +133,7 @@ my $daysmode = Koha::CirculationRules->get_effective_daysmode( > } > ); > my $calendar = Koha::Calendar->new( branchcode => $userenv_branch, days_mode => $daysmode ); >-my $today = DateTime->now( time_zone => C4::Context->tz()); >+my $today = dt_from_string; > > my $patronid = $jwt ? Koha::Token->new->decode_jwt({ token => $jwt }) : undef; > unless ( $patronid ) { >-- >2.34.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 22322
:
123299
|
139170
|
140162
|
143764
|
150770
|
150776
|
161722
|
161723
|
165722
|
165723