Bugzilla – Attachment 67415 Details for
Bug 19247
Feature release change tool
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19247 - Followup: QA test tool fixes
Bug-19247---Followup-QA-test-tool-fixes.patch (text/plain), 5.32 KB, created by
Alex Buckley
on 2017-09-27 19:37:30 UTC
(
hide
)
Description:
Bug 19247 - Followup: QA test tool fixes
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2017-09-27 19:37:30 UTC
Size:
5.32 KB
patch
obsolete
>From d661f70ca0b66f9b82a93604a26958912a1221b8 Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >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 @@ > <input type="hidden" name="id" value="[% id %]" /> > <input type="hidden" name="dbversion" value="[% dbversion %]" /> > <input type="hidden" name="kohaversion" value="[% kohaversion %]" /> >- <fieldset class="rows"> >+ <fieldset class="rows"> > <legend>OPAC and Koha news</legend> > <ol> <li> > <label for="lang">Display location:</label> > <select id="lang" name="lang"> > [% IF ( default_lang == "" ) %] >- <option value="" selected="selected">All</option> >+ <option value="" selected="selected">All</option> > [% ELSE %] >- <option value="" >All</option> >+ <option value="">All</option> > [% END %] > [% IF ( default_lang == "koha" ) %] >- <option value="koha" selected="selected">Librarian interface</option> >+ <option value="koha" selected="selected">Librarian interface</option> > [% ELSE %] >- <option value="koha" >Librarian interface</option> >+ <option value="koha">Librarian interface</option> > [% END %] > [% IF ( default_lang == "slip" ) %] >- <option value="slip" selected="selected">Slip</option> >+ <option value="slip" selected="selected">Slip</option> > [% ELSE %] >- <option value="slip" >Slip</option> >+ <option value="slip">Slip</option> > [% END %] > [% FOREACH lang_lis IN lang_list %] >- [% IF ( lang_lis.language == default_lang ) %] >- <option value="[% lang_lis.language %]" selected="selected">OPAC ([% lang_lis.language %])</option> >- [% ELSE %] >- <option value="[% lang_lis.language %]" >OPAC ([% lang_lis.language %])</option> >- [% END %] >+ [% IF ( lang_lis.language == default_lang ) %] >+ <option value="[% lang_lis.language %]" selected="selected">OPAC ([% lang_lis.language %])</option> >+ [% ELSE %] >+ <option value="[% lang_lis.language %]" >OPAC ([% lang_lis.language %])</option> >+ [% END %] > [% END %] > </select> > </li> >@@ -54,12 +54,12 @@ > <li> > <label for="from">Publication date: </label> > <input id="from" type="text" name="timestamp" size="15" value="[% new_detail.timestamp %]" class="datepickerfrom" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > <li> > <label for="to">Expiration date: </label> > <input id="to" type="text" name="expirationdate" size="15" value="[% new_detail.expirationdate %]" class="datepickerto" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > <li> > <label for="number">Appear in position: </label> >-- >2.1.4
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 19247
:
66792
|
67415
|
67419
|
68113
|
68114
|
68115