diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2018-11-26 12:52:31 +0100 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2018-11-26 12:52:31 +0100 |
| commit | 51e67a2cc790796cf3e6832d430c4473e6377ed8 (patch) | |
| tree | 41e24b0c7e74d95f55dcaca94f778f008774bb4f /admin/WebConsole/includes | |
| parent | 910a4c358af0191b5c83f45f93a444b60a633fff (diff) | |
| parent | 518d4d84f755185f224c82d5cc3f49b350af4b05 (diff) | |
#794: Fast-forward.
Diffstat (limited to 'admin/WebConsole/includes')
| -rw-r--r-- | admin/WebConsole/includes/pintaTablaConfiguraciones.php | 2 | ||||
| -rw-r--r-- | admin/WebConsole/includes/tftputils.php | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/admin/WebConsole/includes/pintaTablaConfiguraciones.php b/admin/WebConsole/includes/pintaTablaConfiguraciones.php index 27e6fac4..ecf69574 100644 --- a/admin/WebConsole/includes/pintaTablaConfiguraciones.php +++ b/admin/WebConsole/includes/pintaTablaConfiguraciones.php @@ -441,8 +441,6 @@ function tablaConfiguracionesCrearSoftIncremental($idordenador) echo $tablaHtml; return($tbPAR); } -<<<<<<< .mine -/**/ // Devuelve un Array nombres de los sistemas operativos en BD con sus identificadores. diff --git a/admin/WebConsole/includes/tftputils.php b/admin/WebConsole/includes/tftputils.php index e7af641f..5cf2da88 100644 --- a/admin/WebConsole/includes/tftputils.php +++ b/admin/WebConsole/includes/tftputils.php @@ -84,7 +84,7 @@ function createBootMode ($cmd, $bootopt, $hostid, $lang) { ordenadores.oglivedir AS oglivedir, aulas.netmask AS netmask, aulas.router AS router, aulas.ntp AS ntp, aulas.dns AS dns, aulas.proxy AS proxy, - aulas.nombreaula AS grupo, repositorios.ip AS iprepo, + aulas.nombreaula AS grupo, IFNULL(repositorios.ip, '') AS iprepo, (SELECT ipserveradm FROM entornos LIMIT 1) AS ipserveradm, menus.resolucion AS vga, perfileshard.descripcion AS hardprofile, centros.directorio, entidades.ogunit @@ -92,7 +92,7 @@ function createBootMode ($cmd, $bootopt, $hostid, $lang) { JOIN aulas USING (idaula) JOIN centros USING (idcentro) JOIN entidades USING (identidad) - JOIN repositorios USING (idrepositorio) + LEFT JOIN repositorios USING (idrepositorio) LEFT JOIN menus USING (idmenu) LEFT JOIN perfileshard USING (idperfilhard) WHERE ordenadores.idordenador='$hostid'"; @@ -277,6 +277,3 @@ function updateBootRepo ($cmd, $repoid) { } return($errors); } - -?> - |