[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.05-20-g8969ecc

[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  8969eccaaeddfffbdc30a2f36e6dfc64595d607e (commit)
       via  81ceef6b8410988dbf14ae0db3dfac64ae084fc9 (commit)
      from  19e4365e340cee480dc1d560e5c54c5140ed8b8a (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 8969eccaaeddfffbdc30a2f36e6dfc64595d607e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue May 8 14:25:57 2018 -0300

    Bug 20351: Shortcut serials scripts if a blocking error appeared
    
    The idea of output_and_exit_if_error (added by bug 18403) is to make sure
    parameters are valid before executing the script.
    If not (old or broken URLs), we shortcut everything coming next to display a
    generic error ("object does not exist", "you do not have permission to do that", etc.)
    
    This bug report fixes the scripts under serials/*.
    
    Test plan:
    Hit the script under the serials directory with an invalid subscriptionid parameter
    and confirm you get an error instead of the normal view with empty values.
    
    The goal is not to be exhaustive during the first iteration, but at least to fix
    the most common views.
    
    For instance:
    /cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=XXX
    /cgi-bin/koha/serials/serials-collection.pl?subscriptionid=XXX
    /cgi-bin/koha/serials/routing.pl?subscriptionid=XXX&op=new
    /cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=XXx
    /cgi-bin/koha/serials/subscription-add.pl?op=dup&subscriptionid=XXX
    
    Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
    Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 62285d2de463811380262e4cc65c82937145d477)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 81ceef6b8410988dbf14ae0db3dfac64ae084fc9
Author: Andreas Roussos <arouss1980 at gmail.com>
Date:   Sun Oct 7 21:00:09 2018 +0300

    Bug 21513: Add a 'Cancel' button to the authority editor and remove duplicate 'Save' button
    
    The authority editor (authorities/authorities.pl) does not have
    a 'Cancel' button. Also, it has two 'Save' buttons.
    
    This patch fixes that by:
    a) adding a 'Cancel' button to the floating toolbar at the top
    b) removing the 'Save' button from the bottom of the page
    
    Test plan:
    1) Go to Home > Authorities and launch the authority editor by
       clicking on 'New authority'. Notice how the editor doesn't
       have a 'Cancel' button. Also notice the two 'Save' buttons.
    2) Apply the patch.
    3) Re-launch the authority editor, and hit cancel; you should
       be taken back to Home > Authorities.
    4) Edit an existing authority, and hit cancel; you should be
       taken back to the details page for the authority you chose.
    5) Edit an authority as new (duplicate), and hit cancel; you
       should be taken back to Home > Authorities (this behaviour
       is mimicking the bibliographic editor: when duplicating a
       biblio the 'Cancel' button will take you back to Home >
       Cataloging).
    
    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 2cffe3a574e14d5f35ce7b1d9ffe28a153dcb37e)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 C4/Serials.pm                                               |    2 ++
 .../intranet-tmpl/prog/en/includes/blocking_errors.inc      |    4 +++-
 .../prog/en/modules/authorities/authorities.tt              |   11 +++++++----
 koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt  |   10 +++++++++-
 .../prog/en/modules/serials/subscription-add.tt             |   10 +++++++++-
 .../prog/en/modules/serials/subscription-detail.tt          |    7 ++++++-
 .../prog/en/modules/serials/subscription-renew.tt           |    2 ++
 serials/routing.pl                                          |    7 ++++++-
 serials/serials-collection.pl                               |    5 +++++
 serials/serials-edit.pl                                     |    1 +
 serials/subscription-add.pl                                 |    3 +++
 serials/subscription-detail.pl                              |    4 ++++
 serials/subscription-renew.pl                               |    4 ++++
 13 files changed, 61 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository