[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.06-10-gcb2d9d9

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.22.x has been updated
       via  cb2d9d992245727d8445290f81fec3a05b9fa1a9 (commit)
       via  c56b10b580673c2dd8408d1dde4c6eac747f5b1e (commit)
      from  b53075b58df01e65371e13dee0b6848d12a181f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cb2d9d992245727d8445290f81fec3a05b9fa1a9
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Mar 31 19:48:23 2016 +0000

    Bug 12663: (QA followup)
    
        Insert SCOUserCSS/JS 'after' OPACUserCSS/JS rather than 'instead of'
        i.e. Remove IF/ELSE and use 2 IF
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
    (cherry picked from commit 6dce6f171d475d49a905d42f7bbab348def71f7c)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit c56b10b580673c2dd8408d1dde4c6eac747f5b1e
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Mar 8 22:04:32 2016 +0000

    Bug 12663 - SCOUserCSS and SCOUserJS ignored on selfcheck login page
    
    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 at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>
    (cherry picked from commit e476be5568d41bb06ce2fef5e8da6417cf9ed682)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm                                                  |    1 +
 .../opac-tmpl/bootstrap/en/includes/doc-head-close.inc      |    6 ++++++
 koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc   |   11 ++++++++++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt       |    9 ++++++++-
 opac/sco/sco-main.pl                                        |    1 +
 5 files changed, 26 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository