Merge branch 'ent-1514-buscador-monitor-detail' into 'develop'

Added wux modules to monitor view

See merge request artica/pandorafms!1024
This commit is contained in:
vgilc 2017-11-29 16:48:11 +01:00
commit 9c32657220
1 changed files with 11 additions and 0 deletions

View File

@ -365,6 +365,9 @@ else {
$prediction_available = db_get_sql ("SELECT count(*)
FROM tserver
WHERE server_type = 5"); //POSTGRESQL AND ORACLE COMPATIBLE
$wux_available = db_get_sql ("SELECT count(*)
FROM tserver
WHERE server_type = 17"); //POSTGRESQL AND ORACLE COMPATIBLE
// Development mode to use all servers
if ($develop_bypass) {
@ -386,6 +389,9 @@ else {
$typemodules[5] = __('Prediction server module');
if (enterprise_installed()) {
$typemodules[7] = __('Web server module');
if ($wux_available) {
$typemodules[8] = __('Wux server module');
}
}
@ -443,6 +449,11 @@ else {
FROM ttipo_modulo
WHERE categoria = 0');
break;
case 8:
$sql = sprintf ('SELECT id_tipo, descripcion
FROM ttipo_modulo
WHERE nombre = \'web_analysis\'');
break;
case '':
$sql = sprintf ('SELECT id_tipo, descripcion
FROM ttipo_modulo');