Skip to content

Commit dc9684a

Browse files
committed
fix(target_actor): groups duplication
1 parent 2681eca commit dc9684a

File tree

1 file changed

+35
-34
lines changed

1 file changed

+35
-34
lines changed

inc/target_actor.class.php

+35-34
Original file line numberDiff line numberDiff line change
@@ -267,41 +267,42 @@ public function export(bool $remove_uuid = false) : array {
267267
$idToRemove = 'id';
268268
if ($remove_uuid) {
269269
$idToRemove = 'uuid';
270-
} else {
271-
// Convert IDs into UUIDs or names
272-
switch ($target_actor['actor_type']) {
273-
case self::ACTOR_TYPE_QUESTION_PERSON:
274-
case self::ACTOR_TYPE_QUESTION_GROUP:
275-
case self::ACTOR_TYPE_QUESTION_SUPPLIER:
276-
case self::ACTOR_TYPE_QUESTION_ACTORS:
277-
case self::ACTOR_TYPE_GROUP_FROM_OBJECT:
278-
case self::ACTOR_TYPE_TECH_GROUP_FROM_OBJECT :
279-
$question = new PluginFormcreatorQuestion;
280-
if ($question->getFromDB($target_actor['actor_value'])) {
281-
$target_actor['actor_value'] = $question->fields['uuid'];
282-
}
283-
break;
284-
case self::ACTOR_TYPE_PERSON:
285-
case self::ACTOR_TYPE_AUTHORS_SUPERVISOR:
286-
$user = new User;
287-
if ($user->getFromDB($target_actor['actor_value'])) {
288-
$target_actor['actor_value'] = $user->fields['name'];
289-
}
290-
break;
291-
case self::ACTOR_TYPE_GROUP:
292-
$group = new Group;
293-
if ($group->getFromDB($target_actor['actor_value'])) {
294-
$target_actor['actor_value'] = $group->fields['completename'];
295-
}
296-
break;
297-
case self::ACTOR_TYPE_SUPPLIER:
298-
$supplier = new Supplier;
299-
if ($supplier->getFromDB($target_actor['actor_value'])) {
300-
$target_actor['actor_value'] = $supplier->fields['name'];
301-
}
302-
break;
303-
}
304270
}
271+
272+
// Convert IDs into UUIDs or names
273+
switch ($target_actor['actor_type']) {
274+
case self::ACTOR_TYPE_QUESTION_PERSON:
275+
case self::ACTOR_TYPE_QUESTION_GROUP:
276+
case self::ACTOR_TYPE_QUESTION_SUPPLIER:
277+
case self::ACTOR_TYPE_QUESTION_ACTORS:
278+
case self::ACTOR_TYPE_GROUP_FROM_OBJECT:
279+
case self::ACTOR_TYPE_TECH_GROUP_FROM_OBJECT :
280+
$question = new PluginFormcreatorQuestion;
281+
if ($question->getFromDB($target_actor['actor_value'])) {
282+
$target_actor['actor_value'] = $question->fields['uuid'];
283+
}
284+
break;
285+
case self::ACTOR_TYPE_PERSON:
286+
case self::ACTOR_TYPE_AUTHORS_SUPERVISOR:
287+
$user = new User;
288+
if ($user->getFromDB($target_actor['actor_value'])) {
289+
$target_actor['actor_value'] = $user->fields['name'];
290+
}
291+
break;
292+
case self::ACTOR_TYPE_GROUP:
293+
$group = new Group;
294+
if ($group->getFromDB($target_actor['actor_value'])) {
295+
$target_actor['actor_value'] = $group->fields['completename'];
296+
}
297+
break;
298+
case self::ACTOR_TYPE_SUPPLIER:
299+
$supplier = new Supplier;
300+
if ($supplier->getFromDB($target_actor['actor_value'])) {
301+
$target_actor['actor_value'] = $supplier->fields['name'];
302+
}
303+
break;
304+
}
305+
305306
unset($target_actor[$idToRemove]);
306307

307308
return $target_actor;

0 commit comments

Comments
 (0)