mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-22 09:31:22 +00:00
use json renderer instead of withJson()
This commit is contained in:
parent
1510acc606
commit
bef2fb0786
|
@ -2394,7 +2394,7 @@ final class SeedDMS_RestapiController { /* {{{ */
|
||||||
foreach($roles as $r)
|
foreach($roles as $r)
|
||||||
$data[] = $this->__getRoleData($r);
|
$data[] = $this->__getRoleData($r);
|
||||||
|
|
||||||
return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>$data), 200);
|
return $this->renderer->json($response, array('success'=>true, 'message'=>'', 'data'=>$data))->withStatus(200);
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function createRole($request, $response) { /* {{{ */
|
function createRole($request, $response) { /* {{{ */
|
||||||
|
@ -2406,7 +2406,7 @@ final class SeedDMS_RestapiController { /* {{{ */
|
||||||
return $check;
|
return $check;
|
||||||
$params = $request->getParsedBody();
|
$params = $request->getParsedBody();
|
||||||
if (empty($params['name'])) {
|
if (empty($params['name'])) {
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'Need a role name.', 'data'=>''), 400);
|
return $this->renderer->json($response, array('success'=>false, 'message'=>'Need a role name.', 'data'=>''))->withStatus(400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$roleName = $params['name'];
|
$roleName = $params['name'];
|
||||||
|
@ -2414,11 +2414,11 @@ final class SeedDMS_RestapiController { /* {{{ */
|
||||||
|
|
||||||
$newRole = $dms->addRole($roleName, $roleType);
|
$newRole = $dms->addRole($roleName, $roleType);
|
||||||
if ($newRole === false) {
|
if ($newRole === false) {
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'Role could not be created, maybe it already exists', 'data'=>''), 500);
|
return $this->renderer->json($response, array('success'=>false, 'message'=>'Role could not be created, maybe it already exists', 'data'=>''))->withStatus(500);
|
||||||
}
|
}
|
||||||
|
|
||||||
// $result = array('id'=>(int)$newGroup->getID());
|
// $result = array('id'=>(int)$newGroup->getID());
|
||||||
return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>$this->__getRoleData($newRole)), 201);
|
return $this->renderer->json($response, array('success'=>true, 'message'=>'', 'data'=>$this->__getRoleData($newRole)))->withStatus(201);
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function deleteRole($request, $response, $args) { /* {{{ */
|
function deleteRole($request, $response, $args) { /* {{{ */
|
||||||
|
@ -2431,12 +2431,12 @@ final class SeedDMS_RestapiController { /* {{{ */
|
||||||
|
|
||||||
if($role = $dms->getRole($args['id'])) {
|
if($role = $dms->getRole($args['id'])) {
|
||||||
if($result = $role->remove($userobj)) {
|
if($result = $role->remove($userobj)) {
|
||||||
return $response->withJson(array('success'=>$result, 'message'=>'', 'data'=>''), 200);
|
return $this->renderer->json($response, array('success'=>$result, 'message'=>'', 'data'=>''))->withStatus(200);
|
||||||
} else {
|
} else {
|
||||||
return $response->withJson(array('success'=>$result, 'message'=>'Could not delete role', 'data'=>''), 500);
|
return $this->renderer->json($response, array('success'=>$result, 'message'=>'Could not delete role', 'data'=>''))->withStatus(500);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'No such role', 'data'=>''), 404);
|
return $this->renderer->json($response, array('success'=>false, 'message'=>'No such role', 'data'=>''))->withStatus(404);
|
||||||
}
|
}
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
|
@ -2458,9 +2458,9 @@ final class SeedDMS_RestapiController { /* {{{ */
|
||||||
foreach ($role->getUsers() as $user) {
|
foreach ($role->getUsers() as $user) {
|
||||||
$data['users'][] = array('id' => (int)$user->getID(), 'login' => $user->getLogin());
|
$data['users'][] = array('id' => (int)$user->getID(), 'login' => $user->getLogin());
|
||||||
}
|
}
|
||||||
return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>$data), 200);
|
return $this->renderer->json($response, array('success'=>true, 'message'=>'', 'data'=>$data))->withStatus(200);
|
||||||
} else {
|
} else {
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'No such role', 'data'=>''), 404);
|
return $this->renderer->json($response, array('success'=>false, 'message'=>'No such role', 'data'=>''))->withStatus(404);
|
||||||
}
|
}
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user