Attachment 17979 Details for Bug 10212 – Bug 10212: Columns configuration for tables

[patch] Bug 10212: Columns configuration for tables

Bug-10212-Columns-configuration-for-tables.patch (text/plain), 21.99 KB, created by Jonathan Druart on 2013-05-07 13:14:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2013-05-07 13:14:28 UTC

Size: 21.99 KB

patch

obsolete

>From 9137c039877445ae3a1e02dc1c8741b0b8e3368e Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Tue, 7 May 2013 14:09:59 +0200
>Subject: [PATCH] Bug 10212: Columns configuration for tables
>
>This development introduces ColVis into Koha and provides a configuration
>page for columns visibility.
>
>ColVis is a plugin for DataTables. It allows to change the visibility of
>the columns in the table.
>
>* This development adds:
>  - the js and css file for ColVis
>  - a new DB table 'columns_settings'
>  - a new template plugin 'ColumnsSettings'
>  - a new package C4::Utils::DataTables::ColumnsSettings
>  - a new admin page admin/columns_settings.pl
>
>* How it works:
>A yaml file is created (admin/columns_settings.yml) in order to take an
>inventory of all tables where ColVis is implemented. This file is read
>to create the list of modules, pages and tables in the configuration
>page.
>There are 3 possible keys in the yml:
> - is_hidden: default is 0
>The column will be hidden.
> - cannot_be_toggled: default is 0.
>ColVis will allow to hide/show the column.
> - cannot_be_modified: default is 0
>Default values (in the yml) won't be modifiable.
>
>When a user changes (or saves) the configuration for one module, all
>columns are added to the DB table. The values in the DB get the upper hand
>on the yaml values.
>
>* Humm, strange?
>It seems weird to have 2 storages for the same values. But I
>think it will be easy to add an entry and maintain the yaml rather than
>adding a new row (and new entry in updatedatabase script) in the DB.
>
>* Test plan:
>1/ Execute the updatedatabase in order to create the new table.
>2/ Take a look to the yml structure.
>3/ Go on the checkouts page (circ/circulation.pl).
>4/ Check that you cannot hide the 3 last columns on the issues table.
>5/ Check that you cannot hide the 2 last columns on the holds table.
>6/ Try to hide/show columns.
>7/ Go on the columns configuration page (admin/columns_settings.pl).
>8/ Only the last tab are filled with data. Check/uncheck checkboxes and
>save.
>9/ Go on the checkouts/holds page and check that the behavior is what
>you expected.
>10/ Give me some feedback :)
>
>* To go further: We can imagine that the configuration is saved for each
>user (and not globally like it is made with this patch).
>---
> C4/Utils/DataTables/ColumnsSettings.pm             |  123 ++++++++++++++++++++
> Koha/Template/Plugin/ColumnsSettings.pm            |   67 +++++++++++
> admin/columns_settings.pl                          |   59 ++++++++++
> admin/columns_settings.yml                         |   52 +++++++++
> circ/circulation.pl                                |    1 +
> installer/data/mysql/kohastructure.sql             |   11 ++
> installer/data/mysql/updatedatabase.pl             |   16 +++
> .../prog/en/includes/columns_settings.inc          |   27 +++++
> koha-tmpl/intranet-tmpl/prog/en/js/datatables.js   |    5 +-
> .../prog/en/modules/admin/admin-home.tt            |    2 +
> .../prog/en/modules/circ/circulation.tt            |   53 +++++++--
> 11 files changed, 403 insertions(+), 13 deletions(-)
> create mode 100644 C4/Utils/DataTables/ColumnsSettings.pm
> create mode 100644 Koha/Template/Plugin/ColumnsSettings.pm
> create mode 100755 admin/columns_settings.pl
> create mode 100644 admin/columns_settings.yml
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
>
>diff --git a/C4/Utils/DataTables/ColumnsSettings.pm b/C4/Utils/DataTables/ColumnsSettings.pm
>new file mode 100644
>index 0000000..e40d8d7
>--- /dev/null
>+++ b/C4/Utils/DataTables/ColumnsSettings.pm
>@@ -0,0 +1,123 @@
>+package C4::Utils::DataTables::ColumnsSettings;
>+
>+use Modern::Perl;
>+use List::Util qw( first );
>+use C4::Context;
>+
>+sub get_yaml {
>+    my $yml_path = C4::Context->config('intranetdir') . '/admin/columns_settings.yml';
>+    my $yaml = eval { YAML::LoadFile( $yml_path ) };
>+    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 ) = @_;
>+
>+    my $list = get_yaml;
>+
>+    my $dbh = C4::Context->dbh;
>+    my $sth = $dbh->prepare(q{
>+        SELECT *
>+        FROM columns_settings
>+        WHERE module = ?
>+            AND page = ?
>+            AND tablename = ?
>+    });
>+
>+    $sth->execute( $module, $page, $tablename );
>+
>+    while ( my $c = $sth->fetchrow_hashref ) {
>+        my $column = first { $c->{columnname} eq $_->{columnname} }
>+            @{ $list->{modules}{$c->{module}}{$c->{page}}{$c->{tablename}} };
>+        $column->{is_hidden} = $c->{is_hidden};
>+        $column->{cannot_be_toggled} = $c->{cannot_be_toggled};
>+    }
>+
>+    return $list->{modules}{$module}{$page}{$tablename};
>+}
>+
>+sub get_modules {
>+    my $list = get_yaml;
>+
>+    my $dbh = C4::Context->dbh;
>+    my $sth = $dbh->prepare(q{
>+        SELECT *
>+        FROM columns_settings
>+    });
>+
>+    $sth->execute;
>+    while ( my $c = $sth->fetchrow_hashref ) {
>+        my $column = first { $c->{columnname} eq $_->{columnname} }
>+            @{ $list->{modules}{$c->{module}}{$c->{page}}{$c->{tablename}} };
>+        $column->{is_hidden} = $c->{is_hidden};
>+        $column->{cannot_be_toggled} = $c->{cannot_be_toggled};
>+    }
>+
>+    return $list->{modules};
>+}
>+
>+sub update_columns {
>+    my ( $params ) = @_;
>+    my $columns = $params->{columns};
>+    my $dbh = C4::Context->dbh;
>+    my $sth_check = $dbh->prepare(q{
>+        SELECT COUNT(*)
>+        FROM columns_settings
>+        WHERE module = ?
>+            AND page = ?
>+            AND tablename = ?
>+            AND columnname = ?
>+    });
>+    my $sth_update = $dbh->prepare(q{
>+        UPDATE columns_settings
>+        SET is_hidden = ?, cannot_be_toggled = ?
>+        WHERE module = ?
>+            AND page = ?
>+            AND tablename = ?
>+            AND columnname = ?
>+    });
>+
>+    my $sth_insert = $dbh->prepare(q{
>+        INSERT INTO columns_settings (is_hidden, cannot_be_toggled, module, page, tablename, columnname )
>+        VALUES ( ?, ?, ?, ?, ?, ? )
>+    });
>+
>+
>+    for my $c ( @$columns ) {
>+        $sth_check->execute( $c->{module}, $c->{page}, $c->{tablename}, $c->{columnname} );
>+        if ( $sth_check->fetchrow ) {
>+            $sth_update->execute(
>+                $c->{is_hidden},
>+                $c->{cannot_be_toggled},
>+                $c->{module},
>+                $c->{page},
>+                $c->{tablename},
>+                $c->{columnname}
>+            );
>+        } else {
>+            $sth_insert->execute(
>+                $c->{is_hidden},
>+                $c->{cannot_be_toggled},
>+                $c->{module},
>+                $c->{page},
>+                $c->{tablename},
>+                $c->{columnname}
>+            );
>+        }
>+    }
>+}
>+
>+1;
>diff --git a/Koha/Template/Plugin/ColumnsSettings.pm b/Koha/Template/Plugin/ColumnsSettings.pm
>new file mode 100644
>index 0000000..5c81d2a
>--- /dev/null
>+++ b/Koha/Template/Plugin/ColumnsSettings.pm
>@@ -0,0 +1,67 @@
>+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.
>+#
>+# 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.
>+
>+use Modern::Perl;
>+
>+use Template::Plugin;
>+use base qw( Template::Plugin );
>+
>+use YAML qw( LoadFile );
>+use JSON qw( to_json );
>+
>+use C4::Context qw( config );
>+use C4::Utils::DataTables::ColumnsSettings;
>+
>+=pod
>+
>+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.
>+
>+For example: [% ColumnsSettings.GetTables( 'circ', 'circulation' ) %]
>+
>+=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{};
>+
>+    my $columns = C4::Utils::DataTables::ColumnsSettings::get_columns( $module, $page, $table );
>+
>+    return $format eq 'json'
>+        ? to_json( $columns )
>+        : $columns
>+}
>+
>+1;
>+
>diff --git a/admin/columns_settings.pl b/admin/columns_settings.pl
>new file mode 100755
>index 0000000..8872440
>--- /dev/null
>+++ b/admin/columns_settings.pl
>@@ -0,0 +1,59 @@
>+#!/usr/bin/perl
>+
>+use Modern::Perl;
>+use CGI;
>+use YAML qw( LoadFile );
>+use C4::Auth;
>+use C4::Context;
>+use C4::Output;
>+use C4::Utils::DataTables::ColumnsSettings qw( get_modules );
>+my $input = new CGI;
>+
>+my ($template, $loggedinuser, $cookie)
>+    = get_template_and_user({template_name => "admin/columns_settings.tt",
>+            query => $input,
>+            type => "intranet",
>+            authnotrequired => 0,
>+            flagsrequired => {parameters => 'parameters_remaining_permissions'},
>+            debug => 1,
>+    });
>+
>+
>+my $action = $input->param('action') // 'list';
>+
>+if ( $action eq 'save' ) {
>+    my $module = $input->param("module");
>+
>+    my @columnids = $input->param("columnid");
>+    my @columns;
>+    for my $columnid ( @columnids ) {
>+        next unless $columnid =~ m|^([^_]*)_([^_]*)_(.*)$|;
>+        my $is_hidden = $input->param($columnid.'_hidden') // 0;
>+        my $cannot_be_toggled = $input->param($columnid.'_cannot_be_toggled') // 0;
>+        push @columns,
>+            {
>+                module => $module,
>+                page => $1,
>+                tablename => $2,
>+                columnname => $3,
>+                is_hidden => $is_hidden,
>+                cannot_be_toggled => $cannot_be_toggled,
>+            };
>+    }
>+
>+
>+    C4::Utils::DataTables::ColumnsSettings::update_columns(
>+        {
>+            columns => \@columns,
>+        }
>+    );
>+
>+    $action = 'list';
>+}
>+
>+if ( $action eq 'list' ) {
>+    my $modules = C4::Utils::DataTables::ColumnsSettings::get_modules;
>+    $template->param( modules => $modules );
>+}
>+
>+output_html_with_http_headers $input, $cookie, $template->output;
>diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
>new file mode 100644
>index 0000000..86efe73
>--- /dev/null
>+++ b/admin/columns_settings.yml
>@@ -0,0 +1,52 @@
>+modules:
>+  circ:
>+    circulation:
>+      issuest:
>+        -
>+          columnname: due_date
>+        -
>+          columnname: title
>+        -
>+          columnname: item_type
>+        -
>+          columnname: checked_out_on
>+        -
>+          columnname: checked_out_from
>+        -
>+          columnname: call_no
>+        -
>+          columnname: charge
>+        -
>+          columnname: price
>+        -
>+          columnname: renew
>+          cannot_be_toggled: 1
>+          cannot_be_modified: 1
>+        -
>+          columnname: check_in
>+          cannot_be_toggled: 1
>+          cannot_be_modified: 1
>+        -
>+          columnname: export
>+          cannot_be_toggled: 1
>+          cannot_be_modified: 1
>+
>+      holdst:
>+        -
>+          columnname: hold_date
>+        -
>+          columnname: title
>+        -
>+          columnname: call_number
>+        -
>+          columnname: barcode
>+        -
>+          columnname: priority
>+        -
>+          columnname: delete
>+          cannot_be_toggled: 1
>+          cannot_be_modified: 1
>+        -
>+          columnname: info
>+          cannot_be_toggled: 1
>+          cannot_be_modified: 1
>diff --git a/circ/circulation.pl b/circ/circulation.pl
>index ef0edf7..b1fdc97 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -358,6 +358,7 @@ if ($borrowernumber) {
>         $getreserv{transfered}    = 0;
>         $getreserv{nottransfered} = 0;
> 
>+        $getreserv{reservedate_sort} = $num_res->{'reservedate'};
>         $getreserv{reservedate}    = format_date( $num_res->{'reservedate'} );
>         $getreserv{reservenumber}  = $num_res->{'reservenumber'};
>         $getreserv{title}          = $getiteminfo->{'title'};
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 34a4cec..50ea7c1 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -3078,6 +3078,17 @@ CREATE TABLE IF NOT EXISTS plugin_data (
>   PRIMARY KEY (plugin_class,plugin_key)
> ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
> 
>+
>+CREATE TABLE IF NOT EXISTS columns_settings (
>+    module varchar(255) NOT NULL,
>+    page varchar(255) NOT NULL,
>+    tablename varchar(255) NOT NULL,
>+    columnname varchar(255) NOT NULL,
>+    cannot_be_toggled int(1) NOT NULL DEFAULT 0,
>+    is_hidden int(1) NOT NULL DEFAULT 0,
>+    PRIMARY KEY(module, page, tablename, columnname)
>+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
>+
> /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
> /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
> /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index be4dfa2..b013c45 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -6784,6 +6784,22 @@ if ( CheckVersion($DBversion) ) {
>     SetVersion ($DBversion);
> }
> 
>+$DBversion = "3.13.00.XXX";
>+if ( CheckVersion($DBversion) ) {
>+    $dbh->do(q{
>+        CREATE TABLE IF NOT EXISTS columns_settings (
>+            module varchar(255) NOT NULL,
>+            page varchar(255) NOT NULL,
>+            tablename varchar(255) NOT NULL,
>+            columnname varchar(255) NOT NULL,
>+            cannot_be_toggled int(1) NOT NULL DEFAULT 0,
>+            is_hidden int(1) NOT NULL DEFAULT 0,
>+            PRIMARY KEY(module, page, tablename, columnname)
>+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8
>+    });
>+    print "Upgrade to $DBversion done (Bug 10212 - Create new table columns_settings)\n";
>+    SetVersion ($DBversion);
>+}
> 
> =head1 FUNCTIONS
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
>new file mode 100644
>index 0000000..5a62030
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
>@@ -0,0 +1,27 @@
>+[% USE ColumnsSettings %]
>+
>+<script type="text/javascript">
>+function KohaTable(selector, dt_parameters, columns_settings) {
>+    var id = 0;
>+    var hidden_ids = [];
>+    var excluded_ids = [];
>+    $(columns_settings).each( function() {
>+        if ( this['is_hidden'] == "1" ) {
>+            hidden_ids.push( id );
>+        }
>+        if ( this['cannot_be_toggled'] == "1" ) {
>+            excluded_ids.push( id );
>+        }
>+        id++;
>+    });
>+    dt_parameters[ "oColVis" ] = { "aiExclude": excluded_ids };
>+    var table = $(selector).dataTable($.extend(true, {}, dataTablesDefaults, dt_parameters));
>+
>+    $(hidden_ids).each(function(index, value) {
>+        table.fnSetColumnVis( value, false );
>+    });
>+
>+    return table;
>+}
>+
>+</script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
>index 703944e..aec05db 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
>+++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
>@@ -23,7 +23,7 @@ var dataTablesDefaults = {
>         "sSearch"           : window.MSG_DT_SEARCH || "Search:",
>         "sZeroRecords"      : window.MSG_DT_ZERO_RECORDS || "No matching records found"
>     },
>-    "sDom": '<"top pager"ilpf>t<"bottom pager"ip>'
>+    "sDom": 'C<"top pager"ilpf>t<"bottom pager"ip>'
> };
> 
> 
>@@ -493,4 +493,5 @@ jQuery.extend( jQuery.fn.dataTableExt.oSort, {
>     "title-string-desc": function ( a, b ) {
>         return ((a < b) ? 1 : ((a > b) ? -1 : 0));
>     }
>-} );
>\ No newline at end of file
>+} );
>+
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>index a5dbe44..9dcbf6b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>@@ -107,6 +107,8 @@
> 	<dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
>     <dt><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></dt>
>     <dd>Choose which plugins to use to suggest searches to patrons and staff.</dd>
>+    <dt><a href="/cgi-bin/koha/admin/tables.pl">Configure tables</a></dt>
>+    <dd>Hide or show columns for tables.</dd>
> </dl>
> </div>
> 
>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 05dbefa..a5dd042 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -1,4 +1,5 @@
> [% USE KohaDates %]
>+[% USE ColumnsSettings %]
> [% IF ( export_remove_fields OR export_with_csv_profile ) %]
>    [% SET exports_enabled = 1 %]
> [% END %]
>@@ -12,10 +13,15 @@
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% INCLUDE 'calendar.inc' %]
>-[% IF ( UseTablesortForCirc ) %]<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
>-[% INCLUDE 'datatables-strings.inc' %]
>-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>[% END %]
>+[% IF ( UseTablesortForCirc ) %]
>+  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>+  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.colvis.css" />
>+  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
>+  [% INCLUDE 'datatables-strings.inc' %]
>+  <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
>+  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.colvis.js"></script>
>+  [% INCLUDE 'columns_settings.inc' %]
>+[% END %]
> <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
> <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery-ui-timepicker-addon.js"></script>
> <script type="text/javascript">
>@@ -23,7 +29,7 @@
> [% IF ( UseTablesortForCirc && dateformat == 'metric' ) %]dt_add_type_uk_date();[% END %]
> [% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %]
> [% UNLESS ( borrowernumber ) %][% UNLESS ( CGIselectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
>-	 $(document).ready(function() {
>+     $(document).ready(function() {
>         $('#patronlists').tabs([% IF ( UseTablesortForCirc ) %]{
>             // Correct table sizing for tables hidden in tabs
>             // http://www.datatables.net/examples/api/tabs_and_scrolling.html
>@@ -34,18 +40,43 @@
>                 }
>             }
>         }[% END %]);
>+
>+
>         [% IF ( UseTablesortForCirc ) %]
>-        $("#issuest").dataTable($.extend(true, {}, dataTablesDefaults, {
>-            "sDom": 't',
>+
>+        columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issuest', 'json' ) %]
>+        [% UNLESS exports_enabled %]
>+            columns_settings = jQuery.grep(columns_settings, function(column) {
>+                return column['columnname'] != 'export';
>+            } );
>+        [% END %]
>+        var issuest = KohaTable("#issuest", {
>+            "sDom": 'C<"clearfix">t',
>             "aaSorting": [],
>             "aoColumnDefs": [
>-                { "aTargets": [ -1, -2[% IF ( exports_enabled ) %], -3[% END %] ], "bSortable": false, "bSearchable": false }
>+                { "aTargets": [ -1, -2[% IF ( exports_enabled ) %], -3[% END %] ], "bSortable": false, "bSearchable": false },
>             ],
>             "aoColumns": [
>                 { "sType": "title-string" },{ "sType": "html" },null,{ "sType": "title-string" },null,null,null,null,null,null[% IF ( exports_enabled ) %],null[% END %]
>             ],
>-            "bPaginate": false
>-        }));
>+            "bPaginate": false,
>+        }, columns_settings);
>+
>+
>+
>+        columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'holdst', 'json' ) %]
>+        var holdst = KohaTable("#holdst", {
>+            "sDom": 'C<"clearfix">t',
>+            "aaSorting": [],
>+            "aoColumnDefs": [
>+                { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
>+            ],
>+            "aoColumns": [
>+                { "sType": "title-string" },{ "sType": "html" },null,null,null,null,null
>+            ],
>+            "bPaginate": false,
>+        }, columns_settings);
>+
> 
>         $("#relissuest").dataTable($.extend(true, {}, dataTablesDefaults, {
>             "sDom": 't',
>@@ -1110,7 +1141,7 @@ No patron matched <span class="ex">[% message %]</span>
> 		<tbody>
>         [% FOREACH reservloo IN reservloop %]
>         <tr class="[% reservloo.color %]">
>-                    <td>[% reservloo.reservedate %]</td>
>+                    <td><span title="[% reservloo.reservedate_sort %]">[% reservloo.reservedate %]</span></td>
>                     <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% reservloo.biblionumber %]"><strong>[% reservloo.title |html %]</strong></a>[% IF ( reservloo.author ) %], by [% reservloo.author %][% END %]</td>
>                     <td>[% reservloo.itemcallnumber %]</td>
> 					<td><em>[% IF ( reservloo.barcodereserv ) %]Item [% reservloo.barcodereserv %]
>-- 
>1.7.10.4

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