From 49858cd510836ac3f51eace07ba8e52dfd176e7f Mon Sep 17 00:00:00 2001 From: Arie Nugraha Date: Wed, 19 Feb 2014 07:31:54 +0700 Subject: [PATCH] Fixed: paging error on reporting module --- js/gui.js | 17 ++++++++++------- lib/utility.inc.php | 10 ++++++++++ simbio2/simbio_GUI/paging/simbio_paging.inc.php | 2 -- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/js/gui.js b/js/gui.js index 20f279a..0ca9410 100755 --- a/js/gui.js +++ b/js/gui.js @@ -290,18 +290,21 @@ var showHideTableRows = function(str_table_id, int_start_row, obj_button, str_hi * Register all events */ $('document').ready(function() { - var container = $('#mainContent,#pageContent,#sidepan'); + var container = $('#mainContent,#pageContent,#sidepan'); // change all anchor behaviour to AJAX in main content container.on('click', 'a', function(evt) { - // avoid conflict with tinyMCE and other non-AJAX anchor - container.find('.mceEditor a, .chzn-container a').addClass('notAJAX'); + // avoid conflict with tinyMCE and other non-AJAX anchor + container.find('.mceEditor a, .chzn-container a').addClass('notAJAX'); var anchor = $(this); - if (anchor.hasClass('notAJAX')) { + if (anchor.hasClass('notAJAX')) { return true; - } - evt.preventDefault(); - var ajaxContainer = $('#mainContent,#pageContent'); + } + if (anchor.attr('target')) { + return true; + } + evt.preventDefault(); + var ajaxContainer = $('#mainContent,#pageContent'); // for submenu // remove other menu class $('.subMenuItem').removeClass('curModuleLink'); diff --git a/lib/utility.inc.php b/lib/utility.inc.php index 855f90b..6d7e236 100755 --- a/lib/utility.inc.php +++ b/lib/utility.inc.php @@ -283,6 +283,16 @@ public static function filterData($mix_input, $str_input_type = 'get', $bool_esc } else { $mix_input = filter_input(INPUT_GET, $mix_input); } + } else { + if ($str_input_type == 'get') { + $mix_input = $_GET[$mix_input]; + } else if ($str_input_type == 'post') { + $mix_input = $_POST[$mix_input]; + } else if ($str_input_type == 'cookie') { + $mix_input = $_COOKIE[$mix_input]; + } else if ($str_input_type == 'session') { + $mix_input = $_SESSION[$mix_input]; + } } // trim whitespace on string diff --git a/simbio2/simbio_GUI/paging/simbio_paging.inc.php b/simbio2/simbio_GUI/paging/simbio_paging.inc.php index 2788cbc..67a115e 100755 --- a/simbio2/simbio_GUI/paging/simbio_paging.inc.php +++ b/simbio2/simbio_GUI/paging/simbio_paging.inc.php @@ -158,5 +158,3 @@ public static function paging($int_all_recs_num, $int_recs_each_page, $int_pages return $_buffer; } } - -?>