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

Merge branch '1412-Filtro-por-más-campos-en-Manage-agents-2' into 'develop' 

Add new fields to filter in search input text and operative selector filter - #1412

See merge request artica/pandorafms!972
This commit is contained in:
vgilc 2017-11-29 16:59:27 +01:00
parent 43308596c1 58cbb2fe48
commit 0e4c17cf1e
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -24,6 +24,7 @@ $sortField = get_parameter('sort_field');
$sort = get_parameter('sort', 'none');
$recursion = (bool) get_parameter('recursion',false);
$disabled = get_parameter('disabled', 0);
$os = get_parameter('os', 0);
if ($ag_group == -1 )
$ag_group = (int) get_parameter ("ag_group", -1);
@ -163,6 +164,20 @@ html_print_select($fields,"disabled",$disabled,'this.form.submit()');
echo "</td>";
echo "<td>";
echo __('Operative System') . '&nbsp;';
$pre_fields = db_get_all_rows_sql('select distinct(tagente.id_os),tconfig_os.description from tagente,tconfig_os where tagente.id_os = tconfig_os.id_os');
$fields = array();
foreach ($pre_fields as $key => $value) {
$fields[$value['id_os']] = $value['description'];
}
html_print_select($fields,"os",$os,'this.form.submit()','All',0);
echo "</td>";
echo "<td>";
echo __('Recursion') . '&nbsp;';
html_print_checkbox ("recursion", 1, $recursion, false, false, 'this.form.submit()');
@ -171,6 +186,8 @@ echo "</td><td>";
echo __('Search') . '&nbsp;';
html_print_input_text ("search", $search, '', 12);
echo ui_print_help_tip(__('Search filter by alias, name, description, IP address or custom fields content'), true);
echo "</td><td>";
echo "<input name='srcbutton' type='submit' class='sub search' value='".__('Search')."'>";
echo "</form>";
@ -296,20 +313,26 @@ if ($search != "") {
}else{
$search_sql = " AND ( nombre " . $order_collation . "
LIKE LOWER('%$search%') OR alias " . $order_collation . "
LIKE LOWER('%$search%')) ";
LIKE LOWER('%$search%') OR comentarios " . $order_collation . " LIKE LOWER('%$search%')
OR EXISTS (SELECT * FROM tagent_custom_data
WHERE id_agent = id_agente AND description LIKE '%$search%'))";
}
}
if ($disabled == 1)
{
$search_sql = " AND disabled = ". $disabled . $search_sql;
$search_sql .= " AND disabled = ". $disabled . $search_sql;
}
else {
if ($disabled == 0) {
$search_sql = " AND disabled = 0" . $search_sql;
$search_sql .= " AND disabled = 0" . $search_sql;
}
}
if($os != 0){
$search_sql .= " AND id_os = " . $os;
}
// Show only selected groups
if ($ag_group > 0) {