refactor: keep distinction between target name and generated name

Signed-off-by: Thierry Bugier <[email protected]>

Author: btry

inc/form.class.php

@@ -558,7 +558,7 @@ public function showTargets($ID, $options = []) {
             $targetItemUrl = Toolbox::getItemTypeFormURL($targetType) . '?id=' . $targetId;
             echo '<td onclick="document.location=\'' . $targetItemUrl . '\'" style="cursor: pointer">';
 
-            echo $target->fields['name'];
+            echo $target->fields['target_name'];
             echo '</td>';
 
             echo '<td align="center" width="32">';
@@ -2439,7 +2439,7 @@ public  function showAddTargetForm() {
 
       echo '<tr class="line1">';
       echo '<td width="15%"><strong>'.__('Name').' <span style="color:red;">*</span></strong></td>';
-      echo '<td width="40%"><input type="text" name="name" style="width:100%;" value="" /></td>';
+      echo '<td width="40%"><input type="text" name="target_name" style="width:100%;" value="" /></td>';
       echo '<td width="15%"><strong>'._n('Type', 'Types', 1).' <span style="color:red;">*</span></strong></td>';
       echo '<td width="30%">';
       $targetTypes = [];

inc/targetchange.class.php

@@ -252,6 +252,15 @@ public function showForm($options = []) {
       echo '<div class="center" style="width: 950px; margin: 0 auto;">';
       echo '<form name="form_target" method="post" action="' . self::getFormURL() . '">';
 
+      // General information: target_name
+      echo '<table class="tab_cadre_fixe">';
+      echo '<tr><th colspan="2">' . __('Edit a destination', 'formcreator') . '</th></tr>';
+      echo '<tr class="line1">';
+      echo '<td width="15%"><strong>' . __('Name') . ' <span style="color:red;">*</span></strong></td>';
+      echo '<td width="85%"><input type="text" name="target_name" style="width:704px;" value="' . $this->fields['target_name'] . '" /></td>';
+      echo '</tr>';
+      echo '</table>';
+
       // change information: title, template...
       echo '<table class="tab_cadre_fixe">';
 

inc/targetticket.class.php

@@ -93,15 +93,22 @@ static function getEnumAssociateRule() {
     * @return void
     */
    public function showForm($ID, $options = []) {
-      global $CFG_GLPI, $DB;
-
       $rand = mt_rand();
 
       $form = $this->getForm();
 
       echo '<div class="center" style="width: 950px; margin: 0 auto;">';
       echo '<form name="form_target" method="post" action="' . self::getFormURL() . '">';
 
+      // General information: target_name
+      echo '<table class="tab_cadre_fixe">';
+      echo '<tr><th colspan="2">' . __('Edit a destination', 'formcreator') . '</th></tr>';
+      echo '<tr class="line1">';
+      echo '<td width="15%"><strong>' . __('Name') . ' <span style="color:red;">*</span></strong></td>';
+      echo '<td width="85%"><input type="text" name="target_name" style="width:704px;" value="' . $this->fields['target_name'] . '" /></td>';
+      echo '</tr>';
+      echo '</table>';
+
       // Ticket information: title, template...
       echo '<table class="tab_cadre_fixe">';
 

install/mysql/plugin_formcreator_empty.sql

@@ -181,6 +181,7 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_targettickets` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(255) NOT NULL DEFAULT '',
   `plugin_formcreator_forms_id` int(11) NOT NULL,
+  `target_name` varchar(255) NOT NULL DEFAULT '',
   `tickettemplates_id` int(11) DEFAULT NULL,
   `content` longtext,
   `due_date_rule` int(11) DEFAULT '1',

install/upgrade_to_2.9.php

@@ -48,6 +48,7 @@ public function upgrade(Migration $migration) {
       $formFk = 'plugin_formcreator_forms_id';
       foreach ($tables as $table) {
          $migration->addField($table, $formFk, 'integer', ['after' => 'name']);
+         $migration->addField($table, 'target_name', 'string', ['after' => $formFk]);
          $migration->addField($table, 'uuid', 'string');
          $migration->migrationOneTable($table);
       }
@@ -68,7 +69,8 @@ public function upgrade(Migration $migration) {
             $table,
             [
                $formFk => $target[$formFk],
-               'uuid'  => plugin_formcreator_getUuid(),
+               'uuid'  => $target['uuid'],
+               'target_name' => $target['name'],
             ],
             [
                'id' => $target['items_id'],