diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2019-05-03 09:52:51 +0200 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2019-05-03 09:52:51 +0200 |
| commit | 7e55dff0d084855ef421295e2eae3fef6fddc501 (patch) | |
| tree | 59b1d4b45fbd3a1aa6cc8e724897e1ecd5435070 /admin/WebConsole/comandos/CrearImagen.php | |
| parent | 2272900dfa23f1c5b7c0926e24ab9c435a3d1b5d (diff) | |
| parent | a1d39fe9442f38db6fbdb2b32f7b97b1467087d6 (diff) | |
Merge branch 'devel' into webconsole3 (fast-forward)
Diffstat (limited to 'admin/WebConsole/comandos/CrearImagen.php')
| -rw-r--r-- | admin/WebConsole/comandos/CrearImagen.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/admin/WebConsole/comandos/CrearImagen.php b/admin/WebConsole/comandos/CrearImagen.php index 532a589a..1944872a 100644 --- a/admin/WebConsole/comandos/CrearImagen.php +++ b/admin/WebConsole/comandos/CrearImagen.php @@ -122,7 +122,8 @@ function HTMLSELECT_imagenes($cmd,$idrepositorio,$idperfilsoft,$disk,$particion, $cmd->texto="SELECT DISTINCT imagenes.idimagen,imagenes.descripcion,imagenes.nombreca, imagenes.idperfilsoft, repositorios.nombrerepositorio, repositorios.ip FROM imagenes INNER JOIN repositorios USING (idrepositorio) - WHERE repositorios.idrepositorio = (SELECT idrepositorio FROM ordenadores WHERE ordenadores.ip='".$masterip."') + WHERE imagenes.tipo=".$IMAGENES_MONOLITICAS." + AND repositorios.idrepositorio IN (SELECT idrepositorio FROM ordenadores WHERE ordenadores.ip='".$masterip."') OR repositorios.ip='".$masterip."' ORDER BY imagenes.descripcion"; $rs=new Recordset; |