summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole/rest/server.php
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2016-11-15 13:57:56 +0000
committerramon <ramongomez@us.es>2016-11-15 13:57:56 +0000
commit146d95527531ac58930b28f50d7a57271e7a5a1f (patch)
treede882b8b1bb5c1480fd79387445373fa3a807b53 /admin/WebConsole/rest/server.php
parent4dea2be384b94897c87ea6f89198d94d001feccd (diff)
#708: AƱadir algunos campos en rutas REST; docmentar ruta {{{/ous/:ouid/groups}}} y repasar definciones de seguridad y de campos requeridos.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5092 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin/WebConsole/rest/server.php')
-rw-r--r--admin/WebConsole/rest/server.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/admin/WebConsole/rest/server.php b/admin/WebConsole/rest/server.php
index 7d0f03be..95ae9fc5 100644
--- a/admin/WebConsole/rest/server.php
+++ b/admin/WebConsole/rest/server.php
@@ -351,6 +351,7 @@ EOD;
$tmp['id'] = $rs->campos["idaula"];
$tmp['name'] = $rs->campos["nombreaula"];
$tmp['inremotepc'] = $rs->campos["inremotepc"]==0 ? false: true;
+ $tmp['group']['id'] = $rs->campos["grupoid"];
$tmp['ou']['id'] = $ouid;
array_push($response, $tmp);
$rs->Siguiente();
@@ -448,6 +449,8 @@ EOD;
$tmp = array();
$tmp['id'] = $rs->campos["idordenador"];
$tmp['name'] = $rs->campos["nombreordenador"];
+ $tmp['ip'] = $rs->campos["ip"];
+ $tmp['mac'] = $rs->campos["mac"];
$tmp['ou']['id'] = $ouid;
$tmp['lab']['id'] = $labid;
array_push($response, $tmp);