summaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2014-11-10 10:39:27 +0000
committerramon <ramongomez@us.es>2014-11-10 10:39:27 +0000
commitd9175d6af3a5b345fa5e678ffe067f553b00ae90 (patch)
treee907b88faf2c9cd80912fc2a890f90afb3c89bd4 /admin
parent5a8c8317b65715dffae30730d16f092464db9a2b (diff)
#677: Corregir erratas en consulta a la BD y en validación de creación de imagen.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@4434 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin')
-rw-r--r--admin/WebConsole/jscripts/propiedades_imagenes.js5
-rw-r--r--admin/WebConsole/propiedades/propiedades_imagenes.php2
2 files changed, 3 insertions, 4 deletions
diff --git a/admin/WebConsole/jscripts/propiedades_imagenes.js b/admin/WebConsole/jscripts/propiedades_imagenes.js
index 0161f715..f8655a22 100644
--- a/admin/WebConsole/jscripts/propiedades_imagenes.js
+++ b/admin/WebConsole/jscripts/propiedades_imagenes.js
@@ -87,15 +87,14 @@ function comprobar_datos(){
if(form.tipoimg.getAttribute("value")!=IMAGENES_INCREMENTALES){
return validate (form.nombreca, validate_nameimagefile, 3) &&
validate (form.nombreca, validate_notnull, 3) &&
- validate (form.descripcion, validate_notnull, 0) &&
- validate (form.numpar, validate_notnull, 4) &&
+ validate (form.descripcion, validate_notnull, 0) &&
validate (form.codpar, validate_notnull, 5) &&
validate (form.idrepositorio, validate_notnull, 6);
}
else{
return validate (form.nombreca, validate_nameimagefile, 3) &&
validate (form.nombreca, validate_notnull, 3) &&
- validate (form.descripcion, validate_notnull, 0) &&
+ validate (form.descripcion, validate_notnull, 0) &&
validate (form.imagenid, validate_notnull, 8);
}
return(true);
diff --git a/admin/WebConsole/propiedades/propiedades_imagenes.php b/admin/WebConsole/propiedades/propiedades_imagenes.php
index 576b16ac..6af11f66 100644
--- a/admin/WebConsole/propiedades/propiedades_imagenes.php
+++ b/admin/WebConsole/propiedades/propiedades_imagenes.php
@@ -293,7 +293,7 @@ function TomaPropiedades($cmd,$idmagen){
LEFT OUTER JOIN repositorios ON repositorios.idrepositorio=imagenes.idrepositorio
LEFT OUTER JOIN perfilessoft ON perfilessoft.idperfilsoft=imagenes.idperfilsoft
LEFT OUTER JOIN ordenadores ON ordenadores.idordenador=imagenes.idordenador
- JOIN aulas ON ordenadores.idaula=aulas.idaula
+ LEFT OUTER JOIN aulas ON ordenadores.idaula=aulas.idaula
WHERE imagenes.idimagen=".$idmagen;
$rs->Comando=&$cmd;
if (!$rs->Abrir()) return(0); // Error al abrir recordset