From abf2678fd8a2eadd0d6aeb94f5179b8c29ea2fe3 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 20 Jan 2014 11:05:49 +0100 Subject: [PATCH] Bug 10212: FIX QA issues FAIL Koha/Template/Plugin/ColumnsSettings.pm FAIL forbidden patterns forbidden pattern: Koha is now under the GPLv3 license (line 9) FAIL koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt FAIL forbidden patterns forbidden pattern: To include datatables files, please use the include file (see bug 10868) (line 20) --- Koha/Template/Plugin/ColumnsSettings.pm | 24 ++++++++++---------- .../prog/en/modules/circ/circulation.tt | 4 +--- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Koha/Template/Plugin/ColumnsSettings.pm b/Koha/Template/Plugin/ColumnsSettings.pm index 888389c..749745c 100644 --- a/Koha/Template/Plugin/ColumnsSettings.pm +++ b/Koha/Template/Plugin/ColumnsSettings.pm @@ -1,21 +1,21 @@ package Koha::Template::Plugin::ColumnsSettings; -# Copyright BibLibre 2013 - # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Copyright BibLibre 2013 +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 6ae351d..03b82fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -17,9 +17,7 @@ [% IF ( UseTablesortForCirc ) %] - - [% INCLUDE 'datatables-strings.inc' %] - + [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] [% END %] -- 1.7.10.4