tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5659-ventana-modal-de-la-vista-de-mapa-discovery-task-se-va' into 'develop'

Browse Source 
fixed error with dialog task list

See merge request artica/pandorafms!3139
This commit is contained in:
Daniel Rodriguez 2020-04-07 10:57:12 +02:00
commit bcaf37c60c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -472,7 +472,7 @@ class DiscoveryTaskList extends Wizard
// Name task. // Name task.
$data[1] = ''; $data[1] = '';
if ($task['disabled'] != 2) { if ($task['disabled'] != 2) {
$data[1] .= '<a href="#" onclick="progress_task_list('.$task['id_rt'].',\''.$task['name'].'\')">'; $data[1] .= '<a onclick="progress_task_list('.$task['id_rt'].',\''.$task['name'].'\')">';
} }
$data[1] .= '<b>'.$task['name'].'</b>'; $data[1] .= '<b>'.$task['name'].'</b>';
@ -623,7 +623,7 @@ class DiscoveryTaskList extends Wizard
&& $task['type'] != DISCOVERY_CLOUD_AWS_RDS && $task['type'] != DISCOVERY_CLOUD_AWS_RDS
) { ) {
if (check_acl($config['id_user'], 0, 'MR')) { if (check_acl($config['id_user'], 0, 'MR')) {
$data[9] .= '<a href="#" onclick="show_map('.$task['id_rt'].',\''.$task['name'].'\')">'; $data[9] .= '<a onclick="show_map('.$task['id_rt'].',\''.$task['name'].'\')">';
$data[9] .= html_print_image( $data[9] .= html_print_image(
'images/dynamic_network_icon.png', 'images/dynamic_network_icon.png',
true true

6
pandora_console/include/javascript/pandora_taskList.js
View File

@ -77,6 +77,7 @@ function fetchTaskList(id, callback) {
} }
function show_map(id, name) { function show_map(id, name) {
var myPos = ["center" / 2, 1];
$("#map_task") $("#map_task")
.empty() .empty()
.hide() .hide()
@ -86,8 +87,9 @@ function show_map(id, name) {
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: false, modal: false,
width: 1280, width: 900,
height: 700 height: 550,
position: { my: "center", at: "center", of: window }
}) })
.show(); .show();