From 1230e42f06ef75067b710926b547ef1b015f86d6 Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Mon, 22 Jul 2013 12:11:01 +0200 Subject: [PATCH] Don't overwrite c var, as it holds catalyst ctx. --- share/templates/helpers/datatables.tt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/share/templates/helpers/datatables.tt b/share/templates/helpers/datatables.tt index edf3a00063..59ee819e3e 100644 --- a/share/templates/helpers/datatables.tt +++ b/share/templates/helpers/datatables.tt @@ -91,13 +91,12 @@ $(document).ready(function() { } ); [% has_from = 0; has_to = 0; -%] - [% FOR c IN helper.dt_columns -%] - [% IF c.search_from_epoch && !has_from -%] - var f = ''; + [% FOR col IN helper.dt_columns -%] + [% IF col.search_from_epoch && !has_from -%] + var f = ''; $('#[% helper.name.remove('[\s+\.]') %]_table_filter').prepend(f); - $('#[% helper.name.remove('[\s+\.]') %]_datepicker_start').datetimepicker({ + $('#[% helper.name.remove('[\s+\.]') %]_datepicker_start').datepicker({ "dateFormat": "yy-mm-dd", - "timeFormat": "HH:mm", "onSelect": function(date) { [% helper.name.remove('[\s+\.]') %]_table.fnFilter(date, 0); } @@ -106,17 +105,16 @@ $(document).ready(function() { }); [% has_from = 1 -%] [% END -%] - [% IF c.search_to_epoch && !has_to -%] + [% IF col.search_to_epoch && !has_to -%] - var t = ''; + var t = ''; if($('#[% helper.name.remove('[\s+\.]') %]_datepicker_start').length > 0) { $('#[% helper.name.remove('[\s+\.]') %]_datepicker_start').parent().after(t); } else { $('#[% helper.name.remove('[\s+\.]') %]_table_filter').prepend(t); } - $('#[% helper.name.remove('[\s+\.]') %]_datepicker_end').datetimepicker({ + $('#[% helper.name.remove('[\s+\.]') %]_datepicker_end').datepicker({ "dateFormat": "yy-mm-dd", - "timeFormat": "HH:mm", "onSelect": function(date) { [% helper.name.remove('[\s+\.]') %]_table.fnFilter(date, 1); }