Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
coastforge-mei committed Jan 25, 2018
2 parents 56c9a91 + e6de608 commit c7a0baf
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Classes/Actions/C4GBrickAction.php
Expand Up @@ -489,8 +489,9 @@ public static function performAction(&$action, &$module)
case C4GBrickActionType::ACTION_CONFIRMPARENTSELECT:
$action = new C4GSetParentIdAction($dialogParams, $listParams, $fieldList, $putVars, $brickDatabase);
$listAction = $action->run();
$module->addFields();
$listAction->setFieldList($module->getFieldList());
$fieldList = $module->addFields();
$module->setFieldList($fieldList);
$listAction->setFieldList($fieldList);
return $listAction->run();
case C4GBrickActionType::ACTION_CONFIRMPARENTFILTER:
$action = new C4GSetFilterAction($dialogParams, $listParams, $fieldList, $putVars, $brickDatabase);
Expand Down

0 comments on commit c7a0baf

Please sign in to comment.