Attachment 29078 Details for Bug 10212 – Bug 10212: Columns configuration for tables - QA FIX

[patch] Bug 10212: Columns configuration for tables - QA FIX

Bug-10212-Columns-configuration-for-tables---QA-FI.patch (text/plain), 2.55 KB, created by Jonathan Druart on 2014-06-20 07:15:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-06-20 07:15:51 UTC

Size: 2.55 KB

patch

obsolete

>From e19a1e2ecb7336d5039e73611d01adb52454aa1a Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Fri, 10 Jan 2014 18:25:20 +0100
>Subject: [PATCH] Bug 10212: Columns configuration for tables - QA FIX
>
>- use YAML is missing in package
>- get_tables and get_excluded are useless routines and can be removed
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> C4/Utils/DataTables/ColumnsSettings.pm  | 13 +------------
> Koha/Template/Plugin/ColumnsSettings.pm | 15 ++-------------
> 2 files changed, 3 insertions(+), 25 deletions(-)
>
>diff --git a/C4/Utils/DataTables/ColumnsSettings.pm b/C4/Utils/DataTables/ColumnsSettings.pm
>index e40d8d7..e05c808 100644
>--- a/C4/Utils/DataTables/ColumnsSettings.pm
>+++ b/C4/Utils/DataTables/ColumnsSettings.pm
>@@ -2,6 +2,7 @@ package C4::Utils::DataTables::ColumnsSettings;
> 
> use Modern::Perl;
> use List::Util qw( first );
>+use YAML;
> use C4::Context;
> 
> sub get_yaml {
>@@ -10,18 +11,6 @@ sub get_yaml {
>     warn "ERROR: the yaml file for DT::ColumnsSettings is not correctly formated: $@" if $@;
>     return $yaml;
> }
>-sub get_tables {
>-    my ( $module, $page ) = @_;
>-    my $list = get_yaml;
>-    return $list->{modules}{$module}{$page};
>-}
>-
>-sub get_excluded {
>-    my ( $module, $page, $table ) = @_;
>-
>-    my $list = get_yaml;
>-    return $list->{modules}{$module}{$page}{$table}{cannot_be_toggled};
>-}
> 
> sub get_columns {
>     my ( $module, $page, $tablename ) = @_;
>diff --git a/Koha/Template/Plugin/ColumnsSettings.pm b/Koha/Template/Plugin/ColumnsSettings.pm
>index 5c81d2a..888389c 100644
>--- a/Koha/Template/Plugin/ColumnsSettings.pm
>+++ b/Koha/Template/Plugin/ColumnsSettings.pm
>@@ -35,23 +35,12 @@ 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.GetTables with the module and the page where the template is called.
>+To use, call ColumnsSettings.GetColumns with the module, the page and the table where the template is called.
> 
>-For example: [% ColumnsSettings.GetTables( 'circ', 'circulation' ) %]
>+For example: [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'holdst' ) %]
> 
> =cut
> 
>-sub GetTables {
>-    my ( $self, $module, $page, $format ) = @_;
>-    $format //= q{};
>-
>-    my $columns = C4::Utils::DataTables::ColumnsSettings::get_tables( $module, $page );
>-
>-    return $format eq 'json'
>-        ? to_json( $columns )
>-        : $columns
>-}
>-
> sub GetColumns {
>     my ( $self, $module, $page, $table, $format ) = @_;
>     $format //= q{};
>-- 
>2.0.0.rc2

Actions: View | Diff | Splinter Review

Attachments on bug 10212: 17978 | 17979 | 18861 | 20625 | 20640 | 21178 | 21179 | 21180 | 21583 | 21584 | 21585 | 24083 | 24084 | 24085 | 24149 | 24150 | 24151 | 24167 | 24168 | 24577 | 27700 | 27701 | 27702 | 27703 | 27704 | 27705 | 29075 | 29076 | 29077 | 29078 | 29079 | 29080 | 29537 | 29538 | 29539 | 29540 | 29541 | 29701 | 29702 | 29703 | 29704 | 29705 | 29718 | 29830 | 29836 | 29837 | 29838 | 29839 | 29840 | 29841 | 29842 | 29882 | 29883 | 29884 | 29885 | 29886 | 29887 | 29888 | 29947 | 31158 | 31159