From d661f70ca0b66f9b82a93604a26958912a1221b8 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Wed, 27 Sep 2017 07:50:48 +0000 Subject: [PATCH] Bug 19247 - Followup: QA test tool fixes Test plan: 1. Run QA test tools and notice that all files pass --- installer/featurereleasetool.pl | 7 ++---- .../intranet-tmpl/prog/en/includes/newsform.inc | 28 +++++++++++----------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/installer/featurereleasetool.pl b/installer/featurereleasetool.pl index 18fb546..ae7d2e5 100755 --- a/installer/featurereleasetool.pl +++ b/installer/featurereleasetool.pl @@ -99,10 +99,8 @@ my @logs = `cd $logdir && ls -t | grep "updatedatabase_2*"`; my $filename_suffix = $logs[0]; my $path = $logdir . '/' . $filename_suffix; -my $fh; my $file; my $count = 0; -my $version; $file = `cat $path`; $file = `echo "$file" | grep -Eo '?[0-9]+[.][0-9]+[.][0-9]+[.][0-9]+?'`; @@ -130,12 +128,11 @@ if ( $op && $op eq 'finished' ) { print $query->redirect("/cgi-bin/koha/mainpage.pl"); exit; } -elsif ( $op && $op eq 'save' ) { #Submit changed systempreferences +elsif ( $op && $op eq 'save' ) { #Submit changed systempreferences unless ( C4::Context->config( 'demo' ) ) { foreach my $param ( $query->param() ) { my ( $prefname ) = ( $param =~ /pref_(.*)/ ); next if ( !defined( $prefname ) ); - my $wholevalue = join( ',', $query->param($param) ); my ($name, $value) = split(/,/,$wholevalue); C4::Context->set_preference( $name, $value ); @@ -144,7 +141,7 @@ elsif ( $op && $op eq 'save' ) { #Submit changed systempreferences } -#Submit news item +#Submit news item my $id = $query->param('id'); my $title = $query->param('title'); my $content = $query->param('featurecontent'); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/newsform.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/newsform.inc index f2e740f..d42464e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/newsform.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/newsform.inc @@ -8,32 +8,32 @@ -
+
OPAC and Koha news
  1. @@ -54,12 +54,12 @@
  2. -
    [% INCLUDE 'date-format.inc' %]
    +
    [% INCLUDE 'date-format.inc' %]
  3. -
    [% INCLUDE 'date-format.inc' %]
    +
    [% INCLUDE 'date-format.inc' %]
  4. -- 2.1.4