tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

#10118 Added group multiselector

Browse Source
This commit is contained in:
Daniel Maya 2023-02-13 17:06:09 +01:00
parent 4cd0820f11
commit 5b263981c4
5 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/extras/mr/61.sql
View File

@ -2,6 +2,8 @@ START TRANSACTION;
ALTER TABLE `tserver` ADD COLUMN `server_keepalive_utimestamp` BIGINT NOT NULL DEFAULT 0; ALTER TABLE `tserver` ADD COLUMN `server_keepalive_utimestamp` BIGINT NOT NULL DEFAULT 0;
ALTER TABLE `tmap` MODIFY COLUMN `id_group` TEXT NOT NULL default '';
CREATE TABLE IF NOT EXISTS `tmonitor_filter` ( CREATE TABLE IF NOT EXISTS `tmonitor_filter` (
`id_filter` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_filter` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_name` VARCHAR(600) NOT NULL, `id_name` VARCHAR(600) NOT NULL,

21
pandora_console/include/class/NetworkMap.class.php
View File

@ -792,17 +792,22 @@ class NetworkMap
|| $this->mapOptions['map_filter']['dont_show_subgroups'] == 1 || $this->mapOptions['map_filter']['dont_show_subgroups'] == 1
) { ) {
// Show only current selected group. // Show only current selected group.
$filter['id_grupo'] = $this->idGroup; $filter['id_grupo'] = explode(',', $this->idGroup);
} else { } else {
// Show current group and children. // Show current group and children.
$childrens = groups_get_children($this->idGroup, null, true); foreach (explode(',', $this->idGroup) as $key => $group) {
if (!empty($childrens)) { $childrens = groups_get_children($group, null, true);
$childrens = array_keys($childrens); if (!empty($childrens)) {
$childrens = array_keys($childrens);
$filter['id_grupo'] = $childrens; if (empty($filter['id_grupo']) === false) {
$filter['id_grupo'][] = $this->idGroup; $filter['id_grupo'] = array_merge($filter['id_grupo'], $childrens);
} else { } else {
$filter['id_grupo'] = $this->idGroup; $filter['id_grupo'] = $childrens;
}
} else {
$filter['id_grupo'][] = $group;
}
} }
} }

14
pandora_console/operation/agentes/pandora_networkmap.editor.php
View File

@ -337,7 +337,14 @@ if ($not_found) {
); );
$table->data[3][0] = __('Description'); $table->data[3][0] = __('Description');
$table->data[3][1] = html_print_textarea('description', 7, 25, $description, '', true); $table->data[3][1] = html_print_input_text(
'description',
$description,
'',
100,
100,
true
);
$table->data[4][0] = __('Position X'); $table->data[4][0] = __('Position X');
$table->data[4][1] = html_print_input_text('pos_x', $offset_x, '', 2, 10, true); $table->data[4][1] = html_print_input_text('pos_x', $offset_x, '', 2, 10, true);
@ -401,11 +408,12 @@ if ($not_found) {
$config['id_user'], $config['id_user'],
'AR', 'AR',
true, true,
'id_group', 'id_group[]',
$id_group, explode(',', $id_group),
'', '',
'', '',
'', '',
true,
true true
).'</div>'; ).'</div>';
$table->data['source_data_group'][1] .= html_print_image( $table->data['source_data_group'][1] .= html_print_image(

6
pandora_console/operation/agentes/pandora_networkmap.php
View File

@ -237,7 +237,7 @@ if ($new_networkmap || $save_networkmap) {
} }
if ($save_networkmap) { if ($save_networkmap) {
$id_group = (int) get_parameter('id_group', 0); $id_group = get_parameter('id_group', 0);
$id_group_map = (int) get_parameter('id_group_map', 0); $id_group_map = (int) get_parameter('id_group_map', 0);
@ -292,7 +292,7 @@ if ($new_networkmap || $save_networkmap) {
$values = []; $values = [];
$values['name'] = $name; $values['name'] = $name;
$values['id_group'] = $id_group; $values['id_group'] = implode(',', $id_group);
$values['source_period'] = 60; $values['source_period'] = 60;
$values['width'] = $width; $values['width'] = $width;
$values['height'] = $height; $values['height'] = $height;
@ -333,7 +333,7 @@ if ($new_networkmap || $save_networkmap) {
if ($source == 'group') { if ($source == 'group') {
$values['source'] = 0; $values['source'] = 0;
$values['source_data'] = $id_group; $values['source_data'] = implode(',', $id_group);
} else if ($source == 'recon_task') { } else if ($source == 'recon_task') {
$values['source'] = 1; $values['source'] = 1;
$values['source_data'] = $recon_task_id; $values['source_data'] = $recon_task_id;

2
pandora_console/operation/agentes/pandora_networkmap.view.php
View File

@ -315,8 +315,6 @@ if (is_ajax() === true) {
$("#source").change(function() { $("#source").change(function() {
const source = $(this).val(); const source = $(this).val();
console.log("aaaaaaaaaaaaaaaa");
if (source == \'recon_task\') { if (source == \'recon_task\') {
$("#form_editor-source_data_ip_mask") $("#form_editor-source_data_ip_mask")
.css(\'display\', \'none\'); .css(\'display\', \'none\');