nextcloud
/
calendar
mirror of https://github.com/nextcloud/calendar
0
0
Fork 0
Code Issues Releases Wiki Activity

fix ObjectTypeController::show()

This commit is contained in:
Georg Ehrke 2014-04-25 12:45:22 +02:00
parent f799f0f044
commit a3b9d15d29
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controller/objectcontroller.php
View File

@ -163,7 +163,7 @@ class ObjectController extends Controller {
return new Response($serializer, Http::STATUS_CREATED);
} catch (BusinessLayerException $ex) {
$this->app->log($ex->getMessage(), 'warn');
return new Response(null, HTTP::STATUS_BAD_REQUEST);
return new Response(array('message' => $ex->getMessage()), $ex->getCode());
}
}
@ -205,7 +205,7 @@ class ObjectController extends Controller {
return new Response($serializer);
} catch(BusinessLayerException $ex) {
$this->app->log($ex->getMessage(), 'warn');
return new Response(null, HTTP::STATUS_BAD_REQUEST);
return new Response(array('message' => $ex->getMessage()), $ex->getCode());
}
}

10
controller/objecttypecontroller.php
View File

@ -94,7 +94,7 @@ abstract class ObjectTypeController extends ObjectController {
return new Response($serializer);
} catch (BusinessLayerException $ex) {
$this->app->log($ex->getMessage(), 'warn');
return new JSONResponse(null, Http::STATUS_BAD_REQUEST);
return new Response(array('message' => $ex->getMessage()), $ex->getCode());
}
}
@ -147,7 +147,7 @@ abstract class ObjectTypeController extends ObjectController {
try {
$userId = $this->api->getUserId();
$calendarId = $this->params('calendarId');
$objectURI = $this->params('objectId');
$objectURI = $this->getObjectId();
$type = $this->objectType;
@ -156,14 +156,14 @@ abstract class ObjectTypeController extends ObjectController {
return new Response(null, HTTP::STATUS_FORBIDDEN);
}
$object = $this->objectBusinessLayer->find($calendar, $objectURI, $type);
$object = $this->objectBusinessLayer->findByType($calendar, $objectURI, $type);
$serializer = new Serializer(Serializer::Object, $object, $this->accept());
return new Response($serializer);
} catch (BusinessLayerException $ex) {
$this->app->log($ex->getMessage(), 'warn');
return new JSONResponse(null, HTTP::STATUS_BAD_REQUEST);
return new Response(array('message' => $ex->getMessage()), $ex->getCode());
}
}
@ -174,6 +174,6 @@ abstract class ObjectTypeController extends ObjectController {
*/
private function getObjectId() {
list($routeApp, $routeController, $routeMethod) = explode('.', $this->params('_route'));
return $this->params(substr($routeController, 0, strlen($routeController) - 1) . 'Id');
return $this->params($routeController . 'Id');
}
}