[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-122-gb1aa841

[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, 18.05.x has been updated
       via  b1aa841e1ed21dc300dc188aa76fd57b33044c95 (commit)
       via  d8b3095f7d533bd2151d710085259f29349faf5b (commit)
      from  9199d752fce9d5bd3189f0d66db826221a5b7c0c (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 b1aa841e1ed21dc300dc188aa76fd57b33044c95
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Mon Aug 20 07:04:37 2018 +0000

    Bug 7996: (QA follow-up) Remove unnecessary permission check view logs template
    
    Permission is checked in the perl file, no need to check again
    in the template.
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 3484db7187ca4ca62a617d9362b8c64c37f60cfd)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit d8b3095f7d533bd2151d710085259f29349faf5b
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Aug 17 11:07:41 2018 +0000

    Bug 7996: Correct wrong permissions for modification log
    
    To test:
     1 - Create a staff patron with catalogue,borrowers,and view_system_logs
         permissions
     2 - Log in using that patron
     3 - Go to tools
     4 - Click 'Log viewer'
     5 - You get a blank page
     6 - View borrower circ screen, note you do not see 'Modification log'
     7 - Edit a borrower, note you do not see 'Modification log'
     8 - Apply patch
     9 - 'Log Viewer' should now load correctly
    10 - You should see 'Modification log' tab during circ
    11 - You should see 'Modification log' tab when editing patron
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit a750ebdbd994ef2a793e632eea4e35bbc7f1ec6d)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc    |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt  |    2 --
 3 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository