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

[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  beba74a79940a3ade1e5081ac71db276519740a9 (commit)
       via  8e91b20fa714649ebd8b64fe4e1074a1e5791000 (commit)
      from  9f1e23735f46a8b014d4a8983796f1b8b37cc9b4 (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 beba74a79940a3ade1e5081ac71db276519740a9
Author: Marc Véron <veron at veron.ch>
Date:   Thu May 5 08:13:53 2016 +0200

    Bug 15823: Redirect opac-discharge.pl to 404 page
    
    See comment #17: Redirect to 404 in opac-discharge.pl and remove
    message in template because with the redirect it will never be
    reached.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    (cherry picked from commit a07db3537d70aa642f1f2e2731eb8e0cf200e1f4)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 8e91b20fa714649ebd8b64fe4e1074a1e5791000
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Tue Feb 23 04:06:30 2016 +0000

    Bug 15823: Can still access patron discharge slip without having the syspref on
    
    EDIT: Fix for OPAC side
    EDIT: Comment 10
    EDIT: Merge conflicts
    
    To test:
    1) Ensure syspref useDischarge is disabled
    2) Go to /cgi-bin/koha/members/discharge.pl?borrowernumber=X&discharge=1
    3) Validate that you are still able to generate a discharge slip for this patron
    4) Apply patch and refresh page
    5) Confirm that you are redirected to the circulation.pl page for the user and that an error message is there.
    OPAC SIDE
    6) Go to the OPAC
    7) Go to /cgi-bin/koha/opac-discharge.pl
    8) Confirm you get a message saying discharges are disabled
    9) Go to /cgi-bin/koha/opac-discharge.pl?op=request
    10) Confirm you see same message
    
    Sponsored-by: Catalyst IT
    
    Followed test plan, works as expected (both staff client and OPAC).
    Re-tested, works OK.
    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 <brendan at bywatersolutions.com>
    (cherry picked from commit 853d3cfe4d76d6f847e4f30dca4d50d278951fd0)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 circ/circulation.pl                                         |    1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt |    5 ++++-
 members/discharge.pl                                        |    9 ++++++++-
 opac/opac-discharge.pl                                      |    5 +++++
 4 files changed, 18 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository