tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed conflict

This commit is contained in:
Daniel Maya 2017-06-14 12:06:41 +02:00
parent f72f61c49e
commit f07f0d1a00
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/functions_ui.php
View File

@ -1300,8 +1300,8 @@ function ui_process_page_head ($string, $bitfield) {
$_GET['sec2'] == 'enterprise/dashboard/main_dashboard') {
$query = ui_get_url_refresh (false, false);
$output .= '<meta http-equiv="refresh" content="' .
$config_refr . '; URL=' . $query . '" />';
//$output .= '<meta http-equiv="refresh" content="' .
//$config_refr . '; URL=' . $query . '" />';
}
}
@ -1617,6 +1617,18 @@ function ui_pagination ($count, $url = false, $offset = 0,
if(!empty($set_id)){
$set_id= " id = '$set_id'";
}
// Pagination links for users include delete, create and other params, now not use these params, and not retry the previous action when go to pagination link.
$remove = array("user_del","disable_user","delete_user");
$finalUrl = $config['homeurl'].'?';
foreach($_GET as $index => $get){
if(!in_array($index, $remove)){
$finalUrl .= $index.'='.$get.'&';
}
}
$url = $finalUrl;
/*
URL passed render links with some parameter
&offset - Offset records passed to next page