Merge branch 'ent-2375-servidores-sin-referenciar' into 'develop'

Fixed new servers (migration and autoprovision) icons

See merge request artica/pandorafms!1564
This commit is contained in:
vgilc 2018-07-02 09:48:28 +02:00
commit 0040837f4b
5 changed files with 17 additions and 3 deletions

View File

@ -101,14 +101,16 @@ foreach ($servers as $server) {
switch ($server['type']) {
case "snmp":
case "event":
case "autoprovision":
case "migration":
$data[3] = $server["version"];
$data[4] = 'N/A';
$data[5] = 'N/A';
$data[4] = __('N/A');
$data[5] = __('N/A');
break;
case "export":
$data[3] = $server["version"];
$data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"];
$data[5] = 'N/A';
$data[5] = __('N/A');
break;
default:
$data[3] = $server["version"];

Binary file not shown.

After

Width:  |  Height:  |  Size: 551 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

View File

@ -364,6 +364,8 @@ define('SERVER_TYPE_MAINFRAME', 15);
define('SERVER_TYPE_SYNC', 16);
define('SERVER_TYPE_WUX', 17);
define('SERVER_TYPE_SYSLOG', 18);
define('SERVER_TYPE_AUTOPROVISION', 19);
define('SERVER_TYPE_MIGRATION', 20);
/* REPORTS */
define('REPORT_TOP_N_MAX', 1);

View File

@ -455,6 +455,16 @@ function servers_get_info ($id_server = -1) {
$server["type"] = "syslog";
$id_modulo = 0;
break;
case SERVER_TYPE_AUTOPROVISION:
$server["img"] = html_print_image ("images/autoprovision.png", true, array ("title" => __('Autoprovision server')));
$server["type"] = "autoprovision";
$id_modulo = 0;
break;
case SERVER_TYPE_MIGRATION:
$server["img"] = html_print_image ("images/migration.png", true, array ("title" => __('Migration server')));
$server["type"] = "migration";
$id_modulo = 0;
break;
default:
$server["img"] = '';
$server["type"] = "unknown";