[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-90-gd6128b6af1

Git repo owner gitmaster at git.koha-community.org
Thu Jul 30 20:08:45 CEST 2020


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, 20.05.x has been updated
       via  d6128b6af130759f0a5838ec58692319c6c3fd9a (commit)
       via  a450d3bb841c1674532e18e9e0e6a2ee49de0cbd (commit)
       via  1b8f257fbe4690ddc3a5fc8678724ee6efde0019 (commit)
       via  323ebe649d2baebac60e59269cc390fa5d83a9a5 (commit)
      from  3583225507c13490278d35616ddead1037da62cf (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 d6128b6af130759f0a5838ec58692319c6c3fd9a
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Tue Jul 21 16:03:54 2020 +0100

    Bug 25765: (QA follow-up) Use method directly in cleanborrowers
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit bd9ece8c194ffc960b5709b884620bf24e29068b)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit a450d3bb841c1674532e18e9e0e6a2ee49de0cbd
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Tue Jul 21 15:58:02 2020 +0100

    Bug 25765: (QA follow-up) Save a DB hit
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 83d63d2302ee77c68dbae8be80fc6a038fa5ce51)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 1b8f257fbe4690ddc3a5fc8678724ee6efde0019
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jun 16 14:01:39 2020 +0200

    Bug 25765: Replace LoginBranchname and LoginBranchcode with use of Branches template plugin
    
    The template plugin Branches contains a method GetLoggedInBranchcode that returns current branch code.
    This patch adds GetLoggedInBranchname to get current branch name.
    It is used to replace vars LoginBranchname and LoginBranchcode sent to all templates in C4/Auth.pm.
    
    In labels and patrons cards modules, I choose to remove a unseless display of
    current branch in a hint.
    
    In acqui/acqui-home.tt, I choose to remove a useless display of current
    branch and also because table of founds contains a filter on library.
    
    Test plan:
    Check pages source code to see branch code or name is correct.
    list of the pages:
    /cgi-bin/koha/acqui/acqui-home.pl
    /cgi-bin/koha/catalogue/detail.pl?biblionumber=XXX
    /cgi-bin/koha/circ/branchoverdues.pl
    /cgi-bin/koha/circ/set-library.pl
    /cgi-bin/koha/circ/offline.pl
    /cgi-bin/koha/labels/label-edit-batch.pl?op=new
    /cgi-bin/koha/labels/label-manage.pl
    /cgi-bin/koha/patroncards/edit-batch.pl
    /cgi-bin/koha/patroncards/manage.pl
    OPAC:
    /cgi-bin/koha/opac-detail.pl?biblionumber=XXX
    
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit cbd86551571260ca6daade57920e0fb3f290dfb4)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 323ebe649d2baebac60e59269cc390fa5d83a9a5
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jun 16 13:59:29 2020 +0200

    Bug 25765: Add GetLoggedInBranchname method
    
    Add GetLoggedInBranchname method to Branches templates plugin.
    
    Also changes GetName method to use Koha::Library instead of direct SQL.
    
    Test plan :
    Run prove t/db_dependent/Template/Plugin/Branches.t
    
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0fcd0fd2707188368fa5b370b808e875c6ea5814)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 C4/Auth.pm                                              |  3 ---
 Koha/Template/Plugin/Branches.pm                        | 17 +++++++++--------
 circ/set-library.pl                                     |  3 +--
 koha-tmpl/intranet-tmpl/prog/en/includes/header.inc     |  8 ++++----
 .../intranet-tmpl/prog/en/includes/members-toolbar.inc  |  2 +-
 .../intranet-tmpl/prog/en/modules/acqui/acqui-home.tt   |  2 +-
 .../intranet-tmpl/prog/en/modules/catalogue/detail.tt   |  2 +-
 .../prog/en/modules/circ/branchoverdues.tt              |  6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt |  3 ++-
 .../intranet-tmpl/prog/en/modules/circ/set-library.tt   |  2 +-
 .../prog/en/modules/labels/label-edit-batch.tt          |  1 -
 .../prog/en/modules/labels/label-manage.tt              |  1 -
 .../prog/en/modules/patroncards/edit-batch.tt           |  1 -
 .../intranet-tmpl/prog/en/modules/patroncards/manage.tt |  1 -
 .../prog/en/modules/tools/cleanborrowers.tt             |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc   |  5 +++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt |  4 ++--
 t/db_dependent/Template/Plugin/Branches.t               | 13 +++++++------
 18 files changed, 36 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list