Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 30808: Add support for version codenames

Browse source 
This patch adds the 'Rosalie' codename to the 22.11 release and adds
corresponding support to the about page for displaying it.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Martin Renvoize 2022-11-25 15:20:58 +00:00 committed by Tomas Cohen Arazi
parent a2e9fd25d1
commit 88c2430bde
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
about.pl
View file

@ -722,6 +722,7 @@ my $dev_team = (sort {$b <=> $a} (keys %{$teams->{team}}))[0];
my $short_version = substr($versions{'kohaVersion'},0,5); my $short_version = substr($versions{'kohaVersion'},0,5);
my $minor = substr($versions{'kohaVersion'},3,2); my $minor = substr($versions{'kohaVersion'},3,2);
my $development_version = ( $minor eq '05' || $minor eq '11' ) ? 0 : 1; my $development_version = ( $minor eq '05' || $minor eq '11' ) ? 0 : 1;
my $codename;
$template->param( short_version => $short_version ); $template->param( short_version => $short_version );
$template->param( development_version => $development_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}; my $name = $teams->{team}->{$version}->{$role}->{name};
# Add role to contributors # Add role to contributors
push @{ $contributors->{$name}->{roles}->{$normalized_role} }, push @{ $contributors->{$name}->{roles}->{$normalized_role} },
@ -758,9 +768,6 @@ for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) {
$contributors->{$name}->{openhub}; $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||""); lc($a2last||"") cmp lc($b2last||"");
} keys %$contributors; } keys %$contributors;
$template->param( kohaCodename => $codename);
$template->param( contributors => \@people ); $template->param( contributors => \@people );
$template->param( maintenance_team => $teams->{team}->{$dev_team} ); $template->param( maintenance_team => $teams->{team}->{$dev_team} );
$template->param( release_team => $teams->{team}->{$short_version} ); $template->param( release_team => $teams->{team}->{$short_version} );

1
docs/teams.yaml
View file

@ -1098,6 +1098,7 @@ team:
- name: Wainui Witika-Park - name: Wainui Witika-Park
22.11: 22.11:
release_date: 1669420799 release_date: 1669420799
codename: Rosalie
manager: manager:
name: Tomás Cohen Arazi name: Tomás Cohen Arazi
manager_assistants: manager_assistants:

4
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
View file

@ -45,7 +45,7 @@
<table> <table>
<caption>Server information</caption> <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">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 interpreter: </th><td>[% perlPath | html %]</td></tr>
<tr><th scope="row">Perl version: </th><td>[% perlVersion | html %]</td></tr> <tr><th scope="row">Perl version: </th><td>[% perlVersion | html %]</td></tr>
@ -554,7 +554,7 @@
[% IF maintenance_team %] [% IF maintenance_team %]
<div class="row"> <div class="row">
<div class="col-md-6"> <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 %] [% IF development_version %]
<p>You are running a development version of Koha</p> <p>You are running a development version of Koha</p>
[% ELSE %] [% ELSE %]