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

Merge branch '55-warning-al-crear-o-editar-un-grupo-integria-4460' into 'develop' 

fixed minor errors and no show warnning in console to create agent groups

See merge request !154
This commit is contained in:
daniel 2017-02-14 16:00:48 +01:00
parent c6dbf7c3b5 fb4cc26193
commit 0eab9f1eaf
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/groups/configure_group.php
View File

@ -98,7 +98,7 @@ else {
} }
$table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox filters'; $table->class = 'databox filters';
if (defined("METACONSOLE")) { if (defined("METACONSOLE")) {
@ -203,8 +203,10 @@ else
$sec = "gagente"; $sec = "gagente";
if (isset($config['metaconsole_node_id']) && $config['metaconsole_node_id'] > 0) { if (isset($config['metaconsole_node_id']) && $config['metaconsole_node_id'] > 0) {
if(isset($config['metaconsole_agent_cache']) && $config['metaconsole_agent_cache'] == 1){
$confirm_bottom = " onsubmit=' return message_check_create();'"; $confirm_bottom = " onsubmit=' return message_check_create();'";
} }
}
else else
{ {
$confirm_bottom = ""; $confirm_bottom = "";

1
pandora_console/godmode/modules/manage_nc_groups.php
View File

@ -187,6 +187,7 @@ foreach ($groups as $group_key => $group_val) {
// Format component groups in tree form // Format component groups in tree form
$groups = component_groups_get_groups_tree_recursive($groups_clean,0,0); $groups = component_groups_get_groups_tree_recursive($groups_clean,0,0);
$table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox data'; $table->class = 'databox data';
$table->head = array (); $table->head = array ();

1
pandora_console/godmode/modules/manage_nc_groups_form.php
View File

@ -44,6 +44,7 @@ else {
$parent = ''; $parent = '';
} }
$table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox filters'; $table->class = 'databox filters';

3
pandora_console/operation/agentes/ver_agente.php
View File

@ -126,8 +126,9 @@ if (is_ajax ()) {
$id_group = (int) get_parameter('id_module_group'); $id_group = (int) get_parameter('id_module_group');
$id_agents = get_parameter('id_agents'); $id_agents = get_parameter('id_agents');
$selection = get_parameter('selection'); $selection = get_parameter('selection');
if(!isset($id_agents)){
$agents = implode(",", $id_agents); $agents = implode(",", $id_agents);
}
$filter_group = ""; $filter_group = "";
$filter_agent = ""; $filter_agent = "";