From bdc2f4a64c86bb66f0459727eaaf1d6bdbd2ea1c Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 10 Dec 2014 17:15:48 +0100 Subject: [PATCH] Working in the tags out the policies. Ticket: #1577 --- pandora_console/godmode/tag/tag.php | 3 ++- pandora_console/include/ajax/module.php | 11 ++++++++++ pandora_console/include/functions_tags.php | 11 ++++++++++ .../operation/agentes/estado_monitores.php | 20 +++++++++++++++++-- 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php index 75968fae97..6cdf8d41a2 100644 --- a/pandora_console/godmode/tag/tag.php +++ b/pandora_console/godmode/tag/tag.php @@ -234,7 +234,8 @@ ui_require_jquery_file ('cluetip'); arrows: true, attribute: 'href', cluetipClass: 'default' - }).click (function () { + }) + .click (function () { return false; }); /* ]]> */ diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 3d70c42ed9..15b228f954 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -1065,6 +1065,16 @@ if ($list_modules) { ?> data)) { diff --git a/pandora_console/include/functions_tags.php b/pandora_console/include/functions_tags.php index c6b73b6ee1..765f22f2d8 100644 --- a/pandora_console/include/functions_tags.php +++ b/pandora_console/include/functions_tags.php @@ -521,6 +521,17 @@ function tags_get_module_tags ($id_agent_module) { return $return; } +function tags_get_module_policy_tags($id_tag, $id_module) { + if (empty($id_tag)) + return false; + + $id_module_policy = db_get_value_filter('id_policy_module', + 'ttag_module', + array('id_tag' => $id_tag, 'id_agente_modulo' => $id_module)); + + return $id_module_policy; +} + /** * Select all tags of a policy module. * diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 184d0f4ee0..0af43e572d 100755 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -19,6 +19,8 @@ global $config; //Ajax tooltip to deploy modules's tag info. if (is_ajax ()) { $get_tag_tooltip = (bool) get_parameter ('get_tag_tooltip', 0); + $get_relations_tooltip = (bool) get_parameter ('get_relations_tooltip', 0); + if ($get_tag_tooltip) { $id_agente_modulo = (int) get_parameter ('id_agente_modulo'); @@ -26,18 +28,32 @@ if (is_ajax ()) { return; $tags = tags_get_module_tags($id_agente_modulo); + if ($tags === false) $tags = array(); echo '

' . __("Tag's information") . '

'; + echo ""; foreach ($tags as $tag) { - echo tags_get_name($tag).'
'; + echo ""; + + echo ""; + + echo ""; + + echo ""; } + echo "
"; + if (tags_get_module_policy_tags($tag, $id_agente_modulo)) { + html_print_image('images/policies.png', false, array('style' => 'vertical-align: middle;')); + } + echo ""; + echo tags_get_name($tag); + echo "
"; return; } - $get_relations_tooltip = (bool) get_parameter ('get_relations_tooltip', 0); if ($get_relations_tooltip) { $id_agente_modulo = (int) get_parameter ('id_agente_modulo');