Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch '2.0'
  • Loading branch information
andrerom committed Mar 19, 2018
2 parents 6bcd183 + 41f3d38 commit dd69942
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Controller/Rest/ContentController.php
Expand Up @@ -30,7 +30,7 @@ class ContentController extends Content
{
public function createContent(Request $request)
{
$contentCreate = $this->parseCreateContentRequest($request);
$contentCreate = $this->parseContentRequest($request);

if (!$this->isUserCreateRequest($request, $contentCreate)) {
return parent::doCreateContent($request, $contentCreate);
Expand Down Expand Up @@ -163,7 +163,7 @@ private function isUserContent($contentId)
private function mapRequestToUserCreateStruct(Request $request)
{
/** @var ContentCreateStruct $contentCreateStruct */
$contentCreateStruct = $this->parseRequestContent($request)->contentCreateStruct;
$contentCreateStruct = $this->parseContentRequest($request)->contentCreateStruct;

$userCreateStruct = new UserCreateStruct();
foreach ($contentCreateStruct->fields as $field) {
Expand Down Expand Up @@ -212,7 +212,7 @@ private function mapRequestToUserCreateStruct(Request $request)
private function mapRequestToParentGroups(Request $request)
{
$groupId = $this->repository->getLocationService()->loadLocation(
$this->parseRequestContent($request)->locationCreateStruct->parentLocationId
$this->parseContentRequest($request)->locationCreateStruct->parentLocationId
)->contentId;
$group = $this->repository->getUserService()->loadUserGroup($groupId);

Expand Down Expand Up @@ -244,7 +244,7 @@ private function mapUserToCreatedContent(User $user)
*/
private function mapRequestToUserUpdateStruct($request)
{
$contentUpdateStruct = $this->parseRequestContent($request);
$contentUpdateStruct = $this->parseContentRequest($request);
$userUpdateStruct = new UserUpdateStruct();
foreach ($contentUpdateStruct->fields as $field) {
if ($field->value instanceof UserFieldValue) {
Expand Down

0 comments on commit dd69942

Please sign in to comment.