diff options
| author | irina <irinagomez@us.es> | 2017-05-19 10:21:53 +0000 |
|---|---|---|
| committer | irina <irinagomez@us.es> | 2017-05-19 10:21:53 +0000 |
| commit | 2154cbbadcf032814ce48828d2049f2dd8e660e4 (patch) | |
| tree | 00057c8d914f3533fc6b9de31a8068dfd83ace08 /admin/WebConsole/rest/server.php | |
| parent | 3a47e17cafa37bbc054a4ddd9960ba82bd440e3f (diff) | |
#708 API REST y Consola: En las propiedades de la imagen se incluye el nombre del sistema operativo
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5308 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin/WebConsole/rest/server.php')
| -rw-r--r-- | admin/WebConsole/rest/server.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/admin/WebConsole/rest/server.php b/admin/WebConsole/rest/server.php index c147d67d..0640e8f7 100644 --- a/admin/WebConsole/rest/server.php +++ b/admin/WebConsole/rest/server.php @@ -938,9 +938,11 @@ $app->get('/ous/:ouid/images/:imgid(/)', 'validateApiKey', $imgid = htmlspecialchars($imgid); // Database query. $cmd->texto = <<<EOD -SELECT adm.idadministradorcentro, imagenes.* +SELECT adm.idadministradorcentro, imagenes.*, nombreso AS os FROM imagenes RIGHT JOIN administradores_centros AS adm USING(idcentro) + LEFT JOIN perfilessoft USING(idperfilsoft) + LEFT JOIN nombresos USING(idnombreso) WHERE adm.idadministradorcentro = '$userid' AND adm.idcentro='$ouid' AND idimagen='$imgid'; @@ -975,6 +977,7 @@ EOD; $response['client']['partition'] = $rs->campos["numpar"]; $response['creationdate'] = $rs->campos["fechacreacion"]; $response['release'] = $rs->campos["revision"]; + $response['os'] = $rs->campos["os"]; } jsonResponse(200, $response); } |