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

2010-04-23 Sergio Martin <sergio.martin@artica.es> 

* godmode/alerts/alert_compounds.php
       godmode/alerts/alert_list.php
       godmode/alerts/alert_templates.php
       godmode/alerts/configure_alert_action.php
       godmode/alerts/alert_actions.php: Changed the
        All group on combos from 1 to 0 and fix the
        group all on tables



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2596 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-04-23 07:59:49 +00:00
parent 5eb65d93df
commit d8f9396e69
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2010-04-23 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_compounds.php
godmode/alerts/alert_list.php
godmode/alerts/alert_templates.php
godmode/alerts/configure_alert_action.php
godmode/alerts/alert_actions.php: Changed the
All group on combos from 1 to 0 and fix the
group all on tables
2010-04-22 Miguel de Dios <miguel.dedios@artica.es>
* include/ajax/reporting.ajax.php: added ajax respond to delete_sla_item and

2
pandora_console/godmode/alerts/alert_actions.php
View File

@ -130,7 +130,7 @@ foreach ($actions as $action) {
$data[0] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_action&id='.$action['id'].'">'.
$action['name'].'</a>';
$data[1] = print_group_icon ($action["id_group"], true) .'&nbsp;'. get_group_name ($action["id_group"]);
$data[1] = print_group_icon ($action["id_group"], true) .'&nbsp;'. get_group_name ($action["id_group"], true);
$data[2] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_actions&delete_action=1&id='.$action['id'].'"
onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.
'<img src="images/cross.png"></a>';

2
pandora_console/godmode/alerts/alert_compounds.php
View File

@ -37,7 +37,7 @@ if ($search != '');
$url .= '&search='.$search;
$groups = get_user_groups (0, 'LM');
if ($id_group != 1 && isset ($groups[$id_group]))
if ($id_group > 0 && isset ($groups[$id_group]))
$agents = get_group_agents ($id_group, false, "none");
else
$agents = get_group_agents (array_keys ($groups), false, "none");

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

@ -45,7 +45,7 @@ $delete_alert = (bool) get_parameter ('delete_alert');
$disable_alert = (bool) get_parameter ('disable_alert');
$enable_alert = (bool) get_parameter ('enable_alert');
$tab = get_parameter('tab', 'list');
$group = get_parameter('group', 1); //1 is All group
$group = get_parameter('group', 0); //0 is All group
$templateName = get_parameter('template_name','');
$moduleName = get_parameter('module_name','');
$agentID = get_parameter('agent_id','');
@ -154,11 +154,11 @@ if ($disable_alert) {
if ($id_agente) {
$agents = array ($id_agente => get_agent_name ($id_agente));
if ($group == 1) {
if ($group == 0) {
$groups = get_user_groups ();
}
else {
$groups = array(1 => __('All'));
$groups = array(0 => __('All'));
}
echo $messageAction;
@ -186,11 +186,11 @@ else {
switch ($tab) {
case 'list':
if ($group == 1) {
if ($group == 0) {
$groups = get_user_groups ();
}
else {
$groups = array(1 => __('All'));
$groups = array(0 => __('All'));
}
$agents = get_group_agents (array_keys ($groups), false, "none");
@ -199,11 +199,11 @@ else {
return;
break;
case 'builder':
if ($group == 1) {
if ($group == 0) {
$groups = get_user_groups ();
}
else {
$groups = array(1 => __('All'));
$groups = array(0 => __('All'));
}
require_once('godmode/alerts/alert_list.builder.php');

2
pandora_console/godmode/alerts/alert_templates.php
View File

@ -212,7 +212,7 @@ foreach ($templates as $template) {
$data[0] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&id='.$template['id'].'">'.
$template['name'].'</a>';
$data[1] = print_group_icon ($template["id_group"], true) .'&nbsp;'. get_group_name ($template['id_group']);
$data[1] = print_group_icon ($template["id_group"], true) .'&nbsp;'. get_group_name ($template['id_group'], true);
$data[3] = get_alert_templates_type_name ($template['type']);
$data[4] = '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template" style="display: inline; float: left">';

2
pandora_console/godmode/alerts/configure_alert_action.php
View File

@ -34,7 +34,7 @@ $id_command = '';
$field1 = '';
$field2 = '';
$field3 = '';
$group = 1;
$group = 0; //All group is 0
if ($id) {
$action = get_alert_action ($id);