Bugzilla – Attachment 89757 Details for
Bug 21626
Add 'current maintenance team' to the 'Koha team' page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21626: (QA follow-up) Don't crash on missing teams file
Bug-21626-QA-follow-up-Dont-crash-on-missing-teams.patch (text/plain), 2.97 KB, created by
Martin Renvoize (ashimema)
on 2019-05-14 14:57:30 UTC
(
hide
)
Description:
Bug 21626: (QA follow-up) Don't crash on missing teams file
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2019-05-14 14:57:30 UTC
Size:
2.97 KB
patch
obsolete
>From 508bed3a11ba6bca5ced633de4770c5baae06441 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 14 May 2019 15:34:44 +0100 >Subject: [PATCH] Bug 21626: (QA follow-up) Don't crash on missing teams file > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > about.pl | 5 ++- > .../intranet-tmpl/prog/en/modules/about.tt | 32 +++++++++++-------- > 2 files changed, 23 insertions(+), 14 deletions(-) > >diff --git a/about.pl b/about.pl >index 970761eba4..76af3fbac3 100755 >--- a/about.pl >+++ b/about.pl >@@ -531,7 +531,10 @@ if ( defined C4::Context->config('docdir') ) { > } > > ## Release teams >-my $teams = LoadFile("$docdir"."/teams.yaml"); >+my $teams = >+ -e "$docdir" . "/teams.yaml" >+ ? LoadFile( "$docdir" . "/teams.yaml" ) >+ : {}; > my $dev_team = (sort {$b <=> $a} (keys %{$teams->{team}}))[0]; > my $short_version = substr($versions{'kohaVersion'},0,5); > my $minor = substr($versions{'kohaVersion'},3,2); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index ff235b589c..2610a157a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -405,21 +405,27 @@ > </ul> > > <h2>Koha release teams</h2> >- <div class="row"> >- <div class="col-md-6"> >- <h3>Koha [% short_version | html %] release team</h3> >- [% IF development_version %] >- <p>You are running a development version of Koha</p> >- [% ELSE %] >- [% INCLUDE team t=release_team v='release' %] >- [% END %] >- </div> >+ [% IF maintenance_team %] >+ <div class="row"> >+ <div class="col-md-6"> >+ <h3>Koha [% short_version | html %] release team</h3> >+ [% IF development_version %] >+ <p>You are running a development version of Koha</p> >+ [% ELSE %] >+ [% INCLUDE team t=release_team v='release' %] >+ [% END %] >+ </div> > >- <div class="col-md-6"> >- <h3>Current maintenance team</h3> >- [% INCLUDE team t=maintenance_team v=short_version %] >+ <div class="col-md-6"> >+ <h3>Current maintenance team</h3> >+ [% INCLUDE team t=maintenance_team v=short_version %] >+ </div> >+ </div> >+ [% ELSE %] >+ <div class="dialog alert"> >+ Could not read the teams.yaml file. Please make sure <docdir> is correctly defined in koha-conf.xml. > </div> >- </div> >+ [% END %] > > <h2>Koha development team</h2> > <ul class="columns-4"> >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21626
:
80968
|
87776
|
87777
|
88483
|
88484
|
88880
|
88881
|
88882
|
88883
|
88884
|
88885
|
88886
|
88890
|
88891
|
89185
|
89186
|
89206
|
89207
|
89216
|
89217
|
89253
|
89281
|
89282
|
89283
|
89295
|
89296
|
89297
|
89298
|
89299
|
89307
|
89308
|
89309
|
89310
|
89311
|
89552
|
89553
|
89554
|
89555
|
89556
|
89557
|
89681
|
89682
|
89683
|
89684
|
89685
|
89686
|
89687
|
89690
|
89691
|
89692
|
89693
|
89694
|
89695
|
89696
|
89697
|
89698
|
89699
|
89700
|
89701
|
89702
|
89703
|
89704
|
89705
|
89713
|
89714
|
89715
|
89716
|
89717
|
89718
|
89719
|
89720
|
89750
|
89751
|
89752
|
89753
|
89754
|
89755
|
89756
|
89757
|
89758
|
89759
|
89771
|
89772
|
89773
|
89774
|
89775
|
89776
|
89777
|
89778
|
89779
|
89780