@@ -, +, @@ --- C4/Utils/DataTables/{ColumnsSettings.pm => TablesSettings.pm} | 8 ++++---- Koha/Template/Plugin/{ColumnsSettings.pm => TablesSettings.pm} | 10 +++++----- admin/columns_settings.pl | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc | 2 +- .../intranet-tmpl/prog/en/includes/str/cataloging_additem.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 2 +- .../intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt | 4 ++-- .../prog/en/modules/course_reserves/course-details.tt | 4 ++-- .../prog/en/modules/course_reserves/course-reserves.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/members/holdshistory.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/members/ill-requests.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt | 4 ++-- .../prog/en/modules/reports/guided_reports_start.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +- .../prog/en/modules/serials/subscription-detail.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +++--- t/db_dependent/{ColumnsSettings.t => TablesSettings.t} | 10 +++++----- 43 files changed, 92 insertions(+), 92 deletions(-) rename C4/Utils/DataTables/{ColumnsSettings.pm => TablesSettings.pm} (90%) rename Koha/Template/Plugin/{ColumnsSettings.pm => TablesSettings.pm} (75%) rename t/db_dependent/{ColumnsSettings.t => TablesSettings.t} (94%) --- a/C4/Utils/DataTables/ColumnsSettings.pm +++ a/C4/Utils/DataTables/ColumnsSettings.pm @@ -1,4 +1,4 @@ -package C4::Utils::DataTables::ColumnsSettings; +package C4::Utils::DataTables::TablesSettings; use Modern::Perl; use List::Util qw( first ); @@ -10,13 +10,13 @@ use Koha::Caches; sub get_yaml { my $yml_path = C4::Context->config('intranetdir') . '/admin/columns_settings.yml'; my $cache = Koha::Caches->get_instance(); - my $yaml = $cache->get_from_cache('ColumnsSettingsYaml'); + my $yaml = $cache->get_from_cache('TablesSettingsYaml'); unless ($yaml) { $yaml = eval { YAML::LoadFile($yml_path) }; - warn "ERROR: the yaml file for DT::ColumnsSettings is not correctly formated: $@" + warn "ERROR: the yaml file for DT::TablesSettings is not correctly formated: $@" if $@; - $cache->set_in_cache( 'ColumnsSettingsYaml', $yaml, { expiry => 3600 } ); + $cache->set_in_cache( 'TablesSettingsYaml', $yaml, { expiry => 3600 } ); } return $yaml; --- a/Koha/Template/Plugin/ColumnsSettings.pm +++ a/Koha/Template/Plugin/ColumnsSettings.pm @@ -1,4 +1,4 @@ -package Koha::Template::Plugin::ColumnsSettings; +package Koha::Template::Plugin::TablesSettings; # This file is part of Koha. # @@ -26,7 +26,7 @@ use YAML qw( LoadFile ); use JSON qw( to_json ); use C4::Context qw( config ); -use C4::Utils::DataTables::ColumnsSettings; +use C4::Utils::DataTables::TablesSettings; =pod @@ -35,9 +35,9 @@ This plugin allows to get the column configuration for a table. First, include the line '[% USE Tables %]' at the top of the template to enable the plugin. -To use, call ColumnsSettings.GetColumns with the module, the page and the table where the template is called. +To use, call TablesSettings.GetColumns with the module, the page and the table where the template is called. -For example: [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'holdst' ) %] +For example: [% TablesSettings.GetColumns( 'circ', 'circulation', 'holdst' ) %] =cut @@ -45,7 +45,7 @@ sub GetColumns { my ( $self, $module, $page, $table, $format ) = @_; $format //= q{}; - my $columns = C4::Utils::DataTables::ColumnsSettings::get_columns( $module, $page, $table ); + my $columns = C4::Utils::DataTables::TablesSettings::get_columns( $module, $page, $table ); return $format eq 'json' ? to_json( $columns ) --- a/admin/columns_settings.pl +++ a/admin/columns_settings.pl @@ -6,7 +6,7 @@ use YAML qw( LoadFile ); use C4::Auth; use C4::Context; use C4::Output; -use C4::Utils::DataTables::ColumnsSettings qw( get_modules ); +use C4::Utils::DataTables::TablesSettings qw( get_modules ); my $input = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( @@ -42,7 +42,7 @@ if ( $action eq 'save' ) { }; } - C4::Utils::DataTables::ColumnsSettings::update_columns( + C4::Utils::DataTables::TablesSettings::update_columns( { columns => \@columns, } @@ -52,7 +52,7 @@ if ( $action eq 'save' ) { } if ( $action eq 'list' ) { - my $modules = C4::Utils::DataTables::ColumnsSettings::get_modules; + my $modules = C4::Utils::DataTables::TablesSettings::get_modules; $template->param( panel => ( $input->param('panel') || 0 ), modules => $modules, --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -1,4 +1,4 @@ -[% USE ColumnsSettings %] +[% USE TablesSettings %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -19,7 +19,7 @@ [% USE Branches %] [% USE Price %] [% USE AuthorisedValues %] -[% USE ColumnsSettings %] +[% USE TablesSettings %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %]