Bug 33108: (follow-up) Don't let restart die if ES indexer not running

[koha-ffzg.git] / about.pl

diff --git a/about.pl b/about.pl
index e92015f..1296996 100755 (executable)
--- a/about.pl
+++ b/about.pl
@@ -588,7 +588,9 @@ $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs;
     my @frameworkcodes = Koha::BiblioFrameworks->search->get_column('frameworkcode');
     my @hidden_biblionumbers;
     push @frameworkcodes, ""; # it's not in the biblio_frameworks table!
+    my $no_FA_framework = 1;
     for my $frameworkcode ( @frameworkcodes ) {
+        $no_FA_framework = 0 if $frameworkcode eq 'FA';
         my $shouldhidemarc_opac = Koha::Filter::MARC::ViewPolicy->should_hide_marc(
             {
                 frameworkcode => $frameworkcode,
@@ -608,6 +610,7 @@ $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs;
           if $shouldhidemarc_intranet->{biblionumber};
     }
     $template->param( warnHiddenBiblionumbers => \@hidden_biblionumbers );
+    $template->param( warnFastCataloging => $no_FA_framework );
 }
 
 {
@@ -722,6 +725,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 +751,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 +771,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 +788,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} );