Merge branch 'bugfix/24060_group_from_object_broken' into support/2.12.0

btry · btry · commit 8a437fbb3c7e · 2022-06-15T10:18:11.000+02:00
diff --git a/inc/abstracttarget.class.php b/inc/abstracttarget.class.php
@@ -696,7 +696,11 @@ protected function prepareActors(PluginFormcreatorForm $form, PluginFormcreatorF
                if ($question->isNewItem()) {
                   continue 2;
                }
-               $itemtype = DropdownField::getSubItemtypeForValues($question->fields['values']);
+               $field = $question->getSubField();
+               if (!method_exists($field, 'getSubItemtype')) {
+                  continue 2;
+               }
+               $itemtype = $field->getSubItemtype();
                if (!is_subclass_of($itemtype, CommonDBTM::class)) {
                   continue 2;
                }

Original file line number	Diff line number	Diff line change
`@@ -696,7 +696,11 @@ protected function prepareActors(PluginFormcreatorForm $form, PluginFormcreatorF`
`696`	`696`	`if ($question->isNewItem()) {`
`697`	`697`	`continue 2;`
`698`	`698`	`}`
`699`		`- $itemtype = DropdownField::getSubItemtypeForValues($question->fields['values']);`
	`699`	`+ $field = $question->getSubField();`
	`700`	`+ if (!method_exists($field, 'getSubItemtype')) {`
	`701`	`+ continue 2;`
	`702`	`+ }`
	`703`	`+ $itemtype = $field->getSubItemtype();`
`700`	`704`	`if (!is_subclass_of($itemtype, CommonDBTM::class)) {`
`701`	`705`	`continue 2;`
`702`	`706`	`}`