Skip to content

Commit b306072

Browse files
committed
Fix(abstractitiltarget): Restore predefined field computation from category (with template)
1 parent de5a5ea commit b306072

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

inc/abstractitiltarget.class.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2290,6 +2290,9 @@ public function getDefaultData(PluginFormcreatorFormAnswer $formanswer): array {
22902290

22912291
$data = $targetItemtype::getDefaultValues();
22922292

2293+
2294+
$data = $this->setTargetCategory($data, $formanswer);
2295+
22932296
$this->fields[$targetTemplateFk] = $this->getTargetTemplate($data);
22942297

22952298
// Get predefined Fields
@@ -2323,19 +2326,29 @@ public function getDefaultData(PluginFormcreatorFormAnswer $formanswer): array {
23232326
unset($predefined_fields['_groups_id_assign']);
23242327
}
23252328

2329+
if (isset($predefined_fields['_groups_id_assign'])) {
2330+
$this->addGroupActor(PluginFormcreatorTarget_Actor::ACTOR_ROLE_ASSIGNED, $predefined_fields['_groups_id_assign']);
2331+
unset($predefined_fields['_groups_id_assign']);
2332+
}
2333+
2334+
if (isset($predefined_fields['itilcategories_id'])) {
2335+
$data['itilcategories_id'] = $predefined_fields['itilcategories_id'];
2336+
unset($predefined_fields['itilcategories_id']);
2337+
}
2338+
23262339
// Manage special values
23272340
if (!isset($predefined_fields['date']) || isset($predefined_fields['date']) && $predefined_fields['date'] == 'NOW') {
23282341
$predefined_fields['date'] = $_SESSION['glpi_currenttime'];
23292342
}
23302343

23312344
$data = array_merge($data, $predefined_fields);
23322345

2333-
$data = $this->setTargetCategory($data, $formanswer);
23342346

23352347
if (($data['requesttypes_id'] ?? 0) == 0) {
23362348
unset($data['requesttypes_id']);
23372349
}
23382350

2351+
23392352
return $data;
23402353
}
23412354

0 commit comments

Comments
 (0)