From 78b513071cf8eb722836620e7fb642901772071d Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 20 Nov 2015 14:53:04 +0000 Subject: [PATCH] Bug 14895 [QA Followup] - Fix indentation for readability Signed-off-by: Kyle M Hall --- .../prog/en/modules/serials/serials-edit.tt | 78 +++++++++++--------- serials/serials-edit.pl | 19 ++--- 2 files changed, 54 insertions(+), 43 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index b426cbc..a213161 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -222,7 +222,6 @@ $(document).ready(function() { [% FOREACH item IN serialslis.items %] [% IF ( item.itemid.substr(0,1) == "N" ) %] - Click to add item @@ -233,40 +232,51 @@ $(document).ready(function() {
-
    [% FOREACH iteminformatio IN item.iteminformation %]
  1. -
    - [% IF (iteminformatio.mandatory) %] - - [% ELSE %] - - [% END %] - [% IF ( iteminformatio.marc_value.type == 'select' ) %] - - [% ELSE %] - [% iteminformatio.marc_value %] - [% END %] - - - - - - [% IF ( iteminformatio.repeatable ) %] - - Clone - +
      + [% FOREACH iteminformatio IN item.iteminformation %] +
    1. +
      + [% IF (iteminformatio.mandatory) %] + + [% ELSE %] + + [% END %] + + [% IF ( iteminformatio.marc_value.type == 'select' ) %] + + [% ELSE %] + [% iteminformatio.marc_value %] + [% END %] + + + + + + + + [% IF ( iteminformatio.repeatable ) %] + + Clone + + [% END %] + + [% IF ( iteminformatio.mandatory ) %] + Required + [% END %] +
      +
    2. [% END %] - [% IF ( iteminformatio.mandatory ) %] Required[% END %] -
  2. - [% END %]
- + +
+ diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl index b1a3877..5d046f3 100755 --- a/serials/serials-edit.pl +++ b/serials/serials-edit.pl @@ -268,9 +268,10 @@ if ( $op and $op eq 'serialchangestatus' ) { my $countdistinct; my $range = scalar(@itemid); for ( my $i = 0 ; $i < $range ; $i++ ) { - if (C4::Items::GetItem($itemid[$i])) { - next(); - } + if ( C4::Items::GetItem( $itemid[$i] ) ) { + next(); + } + unless ( $itemhash{ $itemid[$i] } ) { if ( $serials[$countdistinct] && $serials[$countdistinct] ne "NEW" ) @@ -284,12 +285,12 @@ if ( $op and $op eq 'serialchangestatus' ) { $itemhash{ $itemid[$i] }->{'bibnum'} = $bibnums[$countdistinct]; $countdistinct++; } - push @{ $itemhash{ $itemid[$i] }->{'tags'} }, $tags[$i]; - push @{ $itemhash{ $itemid[$i] }->{'subfields'} }, $subfields[$i]; - push @{ $itemhash{ $itemid[$i] }->{'field_values'} }, - $field_values[$i]; - push @{ $itemhash{ $itemid[$i] }->{'ind_tag'} }, $ind_tag[$i]; - push @{ $itemhash{ $itemid[$i] }->{'indicator'} }, $indicator[$i]; + + push @{ $itemhash{ $itemid[$i] }->{'tags'} }, $tags[$i]; + push @{ $itemhash{ $itemid[$i] }->{'subfields'} }, $subfields[$i]; + push @{ $itemhash{ $itemid[$i] }->{'field_values'} }, $field_values[$i]; + push @{ $itemhash{ $itemid[$i] }->{'ind_tag'} }, $ind_tag[$i]; + push @{ $itemhash{ $itemid[$i] }->{'indicator'} }, $indicator[$i]; } foreach my $item ( keys %itemhash ) { -- 1.7.10.4