mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-29 16:55:05 +02:00
Merge branch 'Tipo_de_datos_en_Module_Data_server' into 'develop'
Removed Web Analysis and Log4x from data server module See merge request artica/pandorafms!1985 Former-commit-id: 53756c67551aba928a0bb545386eceeb870fc8d0
This commit is contained in:
commit
a96606088a
@ -249,9 +249,10 @@ else {
|
|||||||
$idModuleType = '';
|
$idModuleType = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Removed web analysis and log4x from select
|
||||||
$sql = sprintf ('SELECT id_tipo, descripcion
|
$sql = sprintf ('SELECT id_tipo, descripcion
|
||||||
FROM ttipo_modulo
|
FROM ttipo_modulo
|
||||||
WHERE categoria IN (%s)
|
WHERE categoria IN (%s) AND id_tipo NOT IN (24, 25)
|
||||||
ORDER BY descripcion',
|
ORDER BY descripcion',
|
||||||
implode (',', $categories));
|
implode (',', $categories));
|
||||||
|
|
||||||
@ -259,12 +260,6 @@ else {
|
|||||||
$idModuleType, '', '', '', true, false, false, $disabledBecauseInPolicy, false, false, 100);
|
$idModuleType, '', '', '', true, false, false, $disabledBecauseInPolicy, false, false, 100);
|
||||||
|
|
||||||
// Store the relation between id and name of the types on a hidden field
|
// Store the relation between id and name of the types on a hidden field
|
||||||
$sql = sprintf ('SELECT id_tipo, nombre
|
|
||||||
FROM ttipo_modulo
|
|
||||||
WHERE categoria IN (%s)
|
|
||||||
ORDER BY descripcion',
|
|
||||||
implode (',', $categories));
|
|
||||||
|
|
||||||
$type_names = db_get_all_rows_sql($sql);
|
$type_names = db_get_all_rows_sql($sql);
|
||||||
|
|
||||||
$type_names_hash = array();
|
$type_names_hash = array();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user