Bugzilla – Attachment 49864 Details for
Bug 12663
SCOUserCSS and SCOUserJS ignored on selfcheck login page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12663 - SCOUserCSS and SCOUserJS ignored on selfcheck login page
Bug-12663---SCOUserCSS-and-SCOUserJS-ignored-on-se.patch (text/plain), 6.50 KB, created by
Nick Clemens (kidclamp)
on 2016-04-04 15:29:24 UTC
(
hide
)
Description:
Bug 12663 - SCOUserCSS and SCOUserJS ignored on selfcheck login page
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2016-04-04 15:29:24 UTC
Size:
6.50 KB
patch
obsolete
>From 0ce11eb7c03b3fcd3f7a4b2d20994a8da3f1de8b Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Tue, 8 Mar 2016 22:04:32 +0000 >Subject: [PATCH] Bug 12663 - SCOUserCSS and SCOUserJS ignored on selfcheck > login page >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Currently if not logged in when browsing to >http://YOURCATALOG/cgi-bin/koha/sco/sco-main.pl >You are redirected to opac-auth.tt and SCOUserCSS and SCOUserJS are not >loaded. This page passes through a parameter to the template to indicate >this is an SCO login and appropriate CSS and JS should be loaded. > >Additionally this patch ensure that when loggin in using the form you >are redirected to the sco-main.pl instead of the patron account page for >the user. > >To test: >1 - Verify that normal login works on both staff and opac >2 - Verify that SCO link goes to login page if AutoSelfCheckAllowed is >set to "Don't allow" >3 - Enter changes into SCOUserJS and SCOUserCSS and observe these are >present on SCO log in page with AutoSelfCheck disabled >4 - Verify that a logged in opac user without permissions cannot access >the self-checkout module >5 - Verify that AutoSelfCheckAllowed and associated system preferences >function as expected >6 - Verify the AutoSelfCheck user is logged out if they attempt to visit >another page > >Followed test plan. >If I go to http://YOURCATALOG/cgi-bin/koha/sco/sco-main.pl, CSS and JS trigger already on >the login form, I suppose that is intended. >Signed-off-by: Marc Véron <veron@veron.ch> >--- > C4/Auth.pm | 1 + > .../bootstrap/en/includes/doc-head-close.inc | 9 +++++++- > .../bootstrap/en/includes/opac-bottom.inc | 24 +++++++++++++++------- > .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 9 +++++++- > opac/sco/sco-main.pl | 1 + > 5 files changed, 35 insertions(+), 9 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index bff7fcd..2de0a70 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -1247,6 +1247,7 @@ sub checkauth { > opac_css_override => $ENV{'OPAC_CSS_OVERRIDE'}, > ); > >+ $template->param( SCO_login => 1 ) if ( $query->param('sco_user_login') ); > $template->param( OpacPublic => C4::Context->preference("OpacPublic") ); > $template->param( loginprompt => 1 ) unless $info{'nopermission'}; > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >index 54cf6c7..dc61da0 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >@@ -51,7 +51,14 @@ > [% IF ( bidi ) %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> > [% END %] >-[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] >+[% IF SCO_login %] >+ [% SET SCOUserCSS = Koha.Preference('SCOUserCSS') %] >+ [% IF SCOUserCSS %] >+ <style type="text/css">[% SCOUserCSS %]</style> >+ [% END %] >+[% ELSE %] >+ [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] >+[% END %] > <link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL %]/cgi-bin/koha/unapi" /> > [% PROCESS cssinclude %] > <!-- Respond.js brings responsive layout behavior to IE < v.9 --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >index 63c562f..aae5c24 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -266,13 +266,23 @@ $(document).ready(function() { > }); > </script> > [% PROCESS jsinclude %] >- >-[% IF ( OPACUserJS ) %] >- <script type="text/javascript"> >- //<![CDATA[ >- [% OPACUserJS %] >- //]]> >- </script> >+[% IF SCO_login %] >+ [% SET SCOUserJS = Koha.Preference('SCOUserJS') %] >+ [% IF ( SCOUserJS ) %] >+ <script type="text/javascript"> >+ //<![CDATA[ >+ [% SCOUserJS %] >+ //]]> >+ </script> >+ [% END %] >+[% ELSE %] >+ [% IF ( OPACUserJS ) %] >+ <script type="text/javascript"> >+ //<![CDATA[ >+ [% OPACUserJS %] >+ //]]> >+ </script> >+ [% END %] > [% END %] > </body> > </html> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >index a20490e..64ea0f8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >@@ -29,6 +29,9 @@ > <div class="alert"> > <h3>Access denied</h3> > <p>Sorry, the system doesn't think you have permission to access this page. </p> >+ [% IF SCO_login %] >+ <p><a href="/cgi-bin/koha/sco/sco-main.pl?logout.x=1">Logout</a> and try again with a different user</p> >+ [% END %] > </div> > [% END %] > >@@ -149,7 +152,11 @@ > <p>If you do not have a Google account, but do have a local account, you can still log in: </p> > [% END %] > >- <form action="/cgi-bin/koha/opac-user.pl" name="auth" id="auth" method="post"> >+ [% IF SCO_login %] >+ <form action="/cgi-bin/koha/sco/sco-main.pl" name="auth" id="auth" method="post"> >+ [% ELSE %] >+ <form action="/cgi-bin/koha/opac-user.pl" name="auth" id="auth" method="post"> >+ [% END %] > <input type="hidden" name="koha_login_context" value="opac" /> > <fieldset class="brief"> > [% FOREACH INPUT IN INPUTS %] >diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl >index 5584dae..0e2a1b9 100755 >--- a/opac/sco/sco-main.pl >+++ b/opac/sco/sco-main.pl >@@ -64,6 +64,7 @@ if (C4::Context->preference('AutoSelfCheckAllowed')) > $query->param(-name=>'password',-values=>[$AutoSelfCheckPass]); > $query->param(-name=>'koha_login_context',-values=>['sco']); > } >+$query->param(-name=>'sco_user_login',-values=>[1]); > my ($template, $loggedinuser, $cookie) = get_template_and_user({ > template_name => "sco/sco-main.tt", > authnotrequired => 0, >-- >2.1.4
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 12663
:
46736
|
47270
|
47317
|
47318
|
47319
|
48831
|
49595
|
49602
|
49745
|
49864
|
49865
|
49879
|
49880