|
@@ -58,7 +58,7 @@ discard block |
|
|
block discarded – undo |
|
58
|
58
|
{ |
|
59
|
59
|
if ($options['container']) { |
|
60
|
60
|
$page = $options['container']; |
|
61
|
|
- $choiceFilter = function ($choices) use ($page) { |
|
|
61
|
+ $choiceFilter = function($choices) use ($page) { |
|
62
|
62
|
$ret = array(); |
|
63
|
63
|
if ($page instanceof ContentItemContainer && null !== $page->getContentItemMatrix()) { |
|
64
|
64
|
$types = $page->getContentItemMatrix()->getTypes(); |
|
@@ -106,8 +106,8 @@ discard block |
|
|
block discarded – undo |
|
106
|
106
|
|
|
107
|
107
|
try { |
|
108
|
108
|
if ($subject->getId() && $subject->getRegion() !== null && $typeAdmin = $this->sonata->getAdminByClass(get_class($subject))) { |
|
109
|
|
- $view->vars['type']= Str::humanize(Str::classname($subject->getConvertToType())); |
|
110
|
|
- $childAdmin = $this->sonata->getAdminByAdminCode($parentAdmin->getCode() . '|' . $typeAdmin->getCode()); |
|
|
109
|
+ $view->vars['type'] = Str::humanize(Str::classname($subject->getConvertToType())); |
|
|
110
|
+ $childAdmin = $this->sonata->getAdminByAdminCode($parentAdmin->getCode().'|'.$typeAdmin->getCode()); |
|
111
|
111
|
$childAdmin->setRequest($genericAdmin->getRequest()); |
|
112
|
112
|
|
|
113
|
113
|
if ($subject && $subject->getId() && $subject->getPage() && $subject->getPage()->getId()) { |
Please login to merge, or discard this patch.