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

2012-04-27 Vanessa Gil <vanessa.gil@artica.es> 

* godmode/alerts/alerts_list.list.php: Fixed: Action filter
	don't show right actions group.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6210 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-04-27 12:32:40 +00:00
parent 8a14d45a7c
commit 8f824f63ad
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-04-27 Vanessa Gil <vanessa.gil@artica.es>
* godmode/alerts/alerts_list.list.php: Fixed: Action filter
don't show right actions group.
2012-04-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_groups.php

14
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -64,20 +64,28 @@ array('style' => 'background: url(' . $src_code . ') no-repeat right;'), true);
$form_filter .= ui_print_help_tip(__('Type at least two characters to search'), true); //'<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
$form_filter .= "</td>\n";
$form_filter .= "<td>".__('Module name')."</td><td>";
$form_filter .= html_print_input_text ('module_name', $moduleName, '', 12, 255, true);
$form_filter .= "</td>\n";
$form_filter .= "</tr>\n";
$all_groups = db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']);
$groups_user = users_get_groups($config['id_user'], 'AR', $all_groups);
if ($groups_user === false) {
$groups_user = array();
}
$groups_id = implode(',', array_keys($groups_user));
$form_filter .= "<tr>\n";
switch ($config["dbtype"]) {
case "mysql":
case "postgresql":
$temp = db_get_all_rows_sql("SELECT id, name FROM talert_actions;");
$temp = db_get_all_rows_sql("SELECT id, name FROM talert_actions WHERE id_group IN ($groups_id);");
break;
case "oracle":
$temp = db_get_all_rows_sql("SELECT id, name FROM talert_actions");
$temp = db_get_all_rows_sql("SELECT id, name FROM talert_actions WHERE id_group IN ($groups_id)");
break;
}