fix(targetticket,targetchange): unable to select email questions for …

…actors from questions
pluginsGLPI · Aug 22, 2019 · b466d34 · b466d34
1 parent 404232b
commit b466d34
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/inc/targetbase.class.php b/inc/targetbase.class.php
@@ -1106,8 +1106,15 @@ protected function showActorsSettings() {
       PluginFormcreatorQuestion::dropdownForForm(
          $this->getForm()->getID(),
          [
-            'fieldtype' => ['glpiselect'],
-            'values' => User::class,
+            'OR' => [
+               'AND' => [
+                  'fieldtype' => ['glpiselect'],
+                  'values' => User::class,
+               ],
+               [
+                  'fieldtype' => ['email'],
+               ]
+            ],
          ],
          'actor_value_' . PluginFormcreatorTarget_Actor::ACTOR_TYPE_QUESTION_PERSON,
          [
@@ -1236,8 +1243,15 @@ protected function showActorsSettings() {
       PluginFormcreatorQuestion::dropdownForForm(
          $this->getForm()->getID(),
          [
-            'fieldtype' => ['glpiselect'],
-            'values' => User::class,
+            'OR' => [
+               'AND' => [
+                  'fieldtype' => ['glpiselect'],
+                  'values' => User::class,
+               ],
+               [
+                  'fieldtype' => ['email'],
+               ]
+            ],
          ],
          'actor_value_' . PluginFormcreatorTarget_Actor::ACTOR_TYPE_QUESTION_PERSON,
          [
@@ -1373,8 +1387,15 @@ protected function showActorsSettings() {
       PluginFormcreatorQuestion::dropdownForForm(
          $this->getForm()->getID(),
          [
-            'fieldtype' => ['glpiselect'],
-            'values' => User::class,
+            'OR' => [
+               'AND' => [
+                  'fieldtype' => ['glpiselect'],
+                  'values' => User::class,
+               ],
+               [
+                  'fieldtype' => ['email'],
+               ]
+            ],
          ],
          'actor_value_' . PluginFormcreatorTarget_Actor::ACTOR_TYPE_QUESTION_PERSON,
          [