Bugzilla – Attachment 144263 Details for
Bug 30808
Release team 23.05
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30808: Add support for version codenames
Bug-30808-Add-support-for-version-codenames.patch (text/plain), 4.16 KB, created by
Martin Renvoize
on 2022-11-25 15:22:07 UTC
(
hide
)
Description:
Bug 30808: Add support for version codenames
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2022-11-25 15:22:07 UTC
Size:
4.16 KB
patch
obsolete
>From da30cdee0c0d964458c502d962e600c3760c5e87 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Fri, 25 Nov 2022 15:20:58 +0000 >Subject: [PATCH] Bug 30808: Add support for version codenames > >This patch adds the 'Rosalie' codename to the 22.11 release and adds >corresponding support to the about page for displaying it. >--- > about.pl | 16 ++++++++++++---- > docs/teams.yaml | 1 + > koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 ++-- > 3 files changed, 15 insertions(+), 6 deletions(-) > >diff --git a/about.pl b/about.pl >index e92015fbc7..f4d1c7a959 100755 >--- a/about.pl >+++ b/about.pl >@@ -722,6 +722,7 @@ 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); > my $development_version = ( $minor eq '05' || $minor eq '11' ) ? 0 : 1; >+my $codename; > $template->param( short_version => $short_version ); > $template->param( development_version => $development_version ); > >@@ -747,7 +748,16 @@ for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) { > } > } > } >- elsif ( $role ne 'release_date' ) { >+ elsif ( $role eq 'release_date' ) { >+ $teams->{team}->{$version}->{$role} = DateTime->from_epoch( epoch => $teams->{team}->{$version}->{$role}); >+ } >+ elsif ( $role eq 'codename' ) { >+ if ( $version == $short_version ) { >+ $codename = $teams->{team}->{$version}->{$role}; >+ } >+ next; >+ } >+ else { > my $name = $teams->{team}->{$version}->{$role}->{name}; > # Add role to contributors > push @{ $contributors->{$name}->{roles}->{$normalized_role} }, >@@ -758,9 +768,6 @@ for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) { > $contributors->{$name}->{openhub}; > } > } >- else { >- $teams->{team}->{$version}->{$role} = DateTime->from_epoch( epoch => $teams->{team}->{$version}->{$role}); >- } > } > } > >@@ -778,6 +785,7 @@ my @people = map { > lc($a2last||"") cmp lc($b2last||""); > } keys %$contributors; > >+$template->param( kohaCodename => $codename); > $template->param( contributors => \@people ); > $template->param( maintenance_team => $teams->{team}->{$dev_team} ); > $template->param( release_team => $teams->{team}->{$short_version} ); >diff --git a/docs/teams.yaml b/docs/teams.yaml >index 7c94f079d8..717893f4f5 100644 >--- a/docs/teams.yaml >+++ b/docs/teams.yaml >@@ -1098,6 +1098,7 @@ team: > - name: Wainui Witika-Park > 22.11: > release_date: 1669420799 >+ codename: Rosalie > manager: > name: Tomás Cohen Arazi > manager_assistants: >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index 4bfbb00987..b8ac65e8f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -45,7 +45,7 @@ > > <table> > <caption>Server information</caption> >- <tr><th scope="row">Koha version: </th><td>[% kohaVersion | html %]</td></tr> >+ <tr><th scope="row">Koha version: </th><td>[% kohaVersion | html %][% IF kohaCodename %] <strong>[% kohaCodename | html %]</strong>[% END %]</td></tr> > <tr><th scope="row">OS version ('uname -a'): </th><td>[% osVersion | html %]</td></tr> > <tr><th scope="row">Perl interpreter: </th><td>[% perlPath | html %]</td></tr> > <tr><th scope="row">Perl version: </th><td>[% perlVersion | html %]</td></tr> >@@ -554,7 +554,7 @@ > [% IF maintenance_team %] > <div class="row"> > <div class="col-md-6"> >- <h3>Koha [% short_version | html %] release team</h3> >+ <h3>Koha [% short_version | html %][% IF kohaCodename %] ([% kohaCodename | html %])[% END %] release team</h3> > [% IF development_version %] > <p>You are running a development version of Koha</p> > [% ELSE %] >-- >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 30808
:
135202
|
144256
| 144263 |
144265
|
144266