openinfra
/
openstackid-resources
Code Issues Proposed changes

Updated PUT/POST affiliation 

added expand parameter

Change-Id: I2254e4e0de4d5fe1858bf3584331c3a6736ff0cb
This commit is contained in:
Sebastian Marcet 2018-09-03 13:48:14 -03:00
parent 124c55e61d
commit 06e7252276
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/Apis/Protected/Main/OAuth2MembersApiController.php
View File

@ -258,16 +258,19 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
$affiliation = $this->member_service->addAffiliation($member, $data->all());
return $this->created(SerializerRegistry::getInstance()->getSerializer($affiliation)->serialize());
return $this->created(SerializerRegistry::getInstance()->getSerializer($affiliation)->serialize
(
Input::get('expand','')
));
}
catch (ValidationException $ex1) {
Log::warning($ex1);
return $this->error412(array($ex1->getMessage()));
return $this->error412([$ex1->getMessage()]);
}
catch(EntityNotFoundException $ex2)
{
Log::warning($ex2);
return $this->error404(array('message'=> $ex2->getMessage()));
return $this->error404(['message'=> $ex2->getMessage()]);
}
catch (Exception $ex) {
Log::error($ex);
@ -310,7 +313,9 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
$affiliation = $this->member_service->updateAffiliation($member, $affiliation_id, $data->all());
return $this->updated(SerializerRegistry::getInstance()->getSerializer($affiliation)->serialize());
return $this->updated(SerializerRegistry::getInstance()->getSerializer($affiliation)->serialize(
Input::get('expand','')
));
}
catch (ValidationException $ex1) {
Log::warning($ex1);