From e94591483f54f8a8c40dcd01096eaa269d308517 Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Thu, 6 Aug 2015 12:48:07 -0600 Subject: [PATCH] Bug 14510: (QA followup) remove extraneous whitespace --- cataloguing/additem.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index 753a515..696f3cd 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -804,7 +804,7 @@ foreach my $subfield_code (sort keys(%witness)) { my %header_value; $header_value{header_value} = $witness{$subfield_code}; - my $subfieldlib = $tagslib->{$itemtagfield}->{$subfield_code}; + my $subfieldlib = $tagslib->{$itemtagfield}->{$subfield_code}; my $kohafield = $subfieldlib->{kohafield}; if ( $kohafield && $kohafield =~ /items.(.+)/ ) { $header_value{column_name} = $1; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc index 52ab38f..c5bbdba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -9,8 +9,8 @@ function KohaTable(selector, dt_parameters, columns_settings) { var hidden_ids = []; var excluded_ids = []; $(columns_settings).each( function() { - var named_id = $( 'thead th[data-colname="' + this.columnname + '"]', selector ).index( 'th' ); - var used_id = named_id == -1 ? id : named_id; + var named_id = $( 'thead th[data-colname="' + this.columnname + '"]', selector ).index( 'th' ); + var used_id = named_id == -1 ? id : named_id; if ( this['is_hidden'] == "1" ) { hidden_ids.push( used_id ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt index 182f3dd..bb973e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt @@ -12,14 +12,14 @@ [% SET tables = module %] [% IF tables.$pagename.keys and tables.$pagename.keys.size > 0 %] [% FOR tablename IN tables.$pagename.keys.sort %] - [% IF pagename == 'additem' AND tablename == 'itemst' %] -
Saving changes to column visibility here will override framework visibility settings for the table of items.
- [% END %] + [% IF pagename == 'additem' AND tablename == 'itemst' %] +
Saving changes to column visibility here will override framework visibility settings for the table of items.
+ [% END %]
[% IF tablename == 'currencies-table' %] Currency - [% ELSIF pagename == 'additem' AND tablename == 'itemst' %] + [% ELSIF pagename == 'additem' AND tablename == 'itemst' %] Items Editor [% END %] (id=[% tablename %]) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 082ed79..49da445 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -37,8 +37,8 @@ $(document).ready(function(){ }); var columns_settings = [% ColumnsSettings.GetColumns( 'cataloguing', 'additem', 'itemst', 'json' ) %] - // Skip the first column - columns_settings.unshift( { cannot_be_toggled: "1" } ); + // Skip the first column + columns_settings.unshift( { cannot_be_toggled: "1" } ); var itemst = KohaTable("#itemst", { "aoColumnDefs": [ -- 2.4.6