fix(dropdown): show ID in items

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Nov 6, 2019 · dc402d9 · dc402d9
1 parent 1ff2849
commit dc402d9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
@@ -149,6 +149,7 @@ public function displayField($canEdit = true) {
                         'value'    => $this->value,
                         'comments' => false,
                         'entity'   => $_SESSION['glpiactiveentities'],
+                        'displaywith' => ['id'],
                         'rand'     => $rand];
 
             $dparams_cond_crit = [];

diff --git a/inc/targetbase.class.php b/inc/targetbase.class.php
@@ -68,6 +68,10 @@ abstract class PluginFormcreatorTargetBase extends CommonDBChild implements
    /** @var boolean $skipCreateActors Flag to disable creation of actors after creation of the item */
    protected $skipCreateActors = false;
 
+   function isEntityAssign() {
+      return false;
+   }
+
    abstract public function export($remove_uuid = false);
 
    abstract public function save(PluginFormcreatorFormAnswer $formanswer);

diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -262,6 +262,7 @@ protected function showCompositeTicketSettings($rand) {
       echo '<span id="plugin_formcreator_link_ticket">';
       $linkparam = [
          'name'        => '_link_tickets_id',
+         'rand'        => $rand,
          'used'        => $excludedTicketIds,
          'displaywith' => ['id'],
          'display'     => false
@@ -272,28 +273,15 @@ protected function showCompositeTicketSettings($rand) {
       // dropdown of target tickets
       echo '<span id="plugin_formcreator_link_target">';
       $condition = [
-         'id' => new QuerySubQuery([
-            'SELECT' => ['items_id'],
-            'FROM'   => 'glpi_plugin_formcreator_targets AS t1',
-            'WHERE'  => [
-               't1.itemtype'                 => 'PluginFormcreatorTargetTicket',
-               'plugin_formcreator_forms_id' => new QuerySubQuery([
-                  'SELECT' => ['plugin_formcreator_forms_id'],
-                  'FROM'   => 'glpi_plugin_formcreator_targets AS t2',
-                  'WHERE'  => [
-                     't2.itemtype' => 'PluginFormcreatorTargetTicket',
-                     't2.items_id' => $targetTicketId
-                  ]
-               ]),
-            ]
-         ]),
+         'plugin_formcreator_forms_id' => $this->fields['plugin_formcreator_forms_id']
       ];
       echo PluginFormcreatorTargetTicket::dropdown([
-         'name'      => '_link_targettickets_id',
-         'rand'      => $rand,
-         'display'   => false,
-         'used'      => $excludedTargetTicketsIds,
-         'condition' => $condition,
+         'name'        => '_link_targettickets_id',
+         'rand'        => $rand,
+         'display'     => false,
+         'used'        => $excludedTargetTicketsIds,
+         'displaywith' => ['id'],
+         'condition'   => $condition,
       ]);
       echo '</span>';
       echo '</div>';