feat(target): remove target itemtype

this type is useless and only is intermediate in relation between form and target change or target ticket Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Aug 22, 2019 · 41bc125 · 41bc125
1 parent 93597c0
commit 41bc125
Show file tree

Hide file tree

Showing 23 changed files with 1,024 additions and 2,721 deletions.
diff --git a/ajax/target.php b/ajax/target.php
diff --git a/front/form.form.php b/front/form.form.php
@@ -39,37 +39,46 @@
 
 $form = new PluginFormcreatorForm();
 
-if (isset($_POST["add"])) {
+if (isset($_POST['add'])) {
    // Add a new Form
-   Session::checkRight("entity", UPDATE);
+   Session::checkRight('entity', UPDATE);
    $newID = $form->add($_POST);
+   Html::redirect($CFG_GLPI['root_doc'] . '/plugins/formcreator/front/form.form.php?id=' . $newID);
 
-   Html::redirect($CFG_GLPI["root_doc"] . '/plugins/formcreator/front/form.form.php?id=' . $newID);
-
-} else if (isset($_POST["update"])) {
+} else if (isset($_POST['update'])) {
    // Edit an existing form
-   Session::checkRight("entity", UPDATE);
+   Session::checkRight('entity', UPDATE);
    $form->update($_POST);
    Html::back();
 
-} else if (isset($_POST["delete"])) {
+} else if (isset($_POST['delete'])) {
    // Delete a form (is_deleted = true)
-   Session::checkRight("entity", UPDATE);
+   Session::checkRight('entity', UPDATE);
    $form->delete($_POST);
    $form->redirectToList();
 
-} else if (isset($_POST["restore"])) {
+} else if (isset($_POST['restore'])) {
    // Restore a deleteted form (is_deleted = false)
-   Session::checkRight("entity", UPDATE);
+   Session::checkRight('entity', UPDATE);
    $form->restore($_POST);
    $form->redirectToList();
 
-} else if (isset($_POST["purge"])) {
+} else if (isset($_POST['purge'])) {
    // Delete defenitively a form from DB and all its datas
-   Session::checkRight("entity", UPDATE);
+   Session::checkRight('entity', UPDATE);
    $form->delete($_POST, 1);
    $form->redirectToList();
 
+} else if (isset($_POST['add_target'])) {
+   Session::checkRight('entity', UPDATE);
+   $form->addTarget($_POST);
+   Html::back();
+
+} else if (isset($_POST['delete_target'])) {
+   Session::checkRight('entity', UPDATE);
+   $form->deleteTarget($_POST);
+   Html::redirect($CFG_GLPI['root_doc'] . '/plugins/formcreator/front/form.form.php?id=' . $_POST['plugin_formcreator_forms_id']);
+
 } else if (isset($_POST['filetype_create'])) {
    $documentType = new DocumentType();
    $canAddType = $documentType->canCreate();
@@ -86,9 +95,9 @@
    }
    Html::back();
 
-} else if (isset($_GET["import_form"])) {
+} else if (isset($_GET['import_form'])) {
    // Import form
-   Session::checkRight("entity", UPDATE);
+   Session::checkRight('entity', UPDATE);
    Html::header(
       PluginFormcreatorForm::getTypeName(2),
       $_SERVER['PHP_SELF'],
@@ -102,9 +111,9 @@
    $form->showImportForm();
    Html::footer();
 
-} else if (isset($_POST["import_send"])) {
+} else if (isset($_POST['import_send'])) {
    // Import form
-   Session::checkRight("entity", UPDATE);
+   Session::checkRight('entity', UPDATE);
    $form->importJson($_REQUEST);
    Html::back();
 
@@ -142,7 +151,7 @@
 
 } else {
    // Show forms form
-   Session::checkRight("entity", UPDATE);
+   Session::checkRight('entity', UPDATE);
 
    Html::header(
       PluginFormcreatorForm::getTypeName(2),

diff --git a/front/target.form.php b/front/target.form.php
diff --git a/front/targetchange.form.php b/front/targetchange.form.php
@@ -53,42 +53,33 @@
    $use_notification = ($_POST['use_notification'] == 0) ? 0 : 1;
    $targetChange_actor = new PluginFormcreatorTargetChange_Actor();
    $targetChange_actor->add([
-         'plugin_formcreator_targetchanges_id'  => $id,
-         'actor_role'                           => $_POST['actor_role'],
-         'actor_type'                           => $_POST['actor_type'],
-         'actor_value'                          => $actor_value,
-         'use_notification'                     => $use_notification
+      'plugin_formcreator_targetchanges_id'  => $id,
+      'actor_role'                           => $_POST['actor_role'],
+      'actor_type'                           => $_POST['actor_type'],
+      'actor_value'                          => $actor_value,
+      'use_notification'                     => $use_notification
    ]);
    Html::back();
 
 } else if (isset($_GET['delete_actor'])) {
    $targetChange_actor = new PluginFormcreatorTargetChange_Actor();
    $targetChange_actor->delete([
-         'id'                                   => (int) $_GET['delete_actor']
+      'id'  => (int) $_GET['delete_actor']
    ]);
    Html::back();
 
    // Show target ticket form
 } else {
    Html::header(
-         __('Form Creator', 'formcreator'),
-         $_SERVER['PHP_SELF'],
-         'admin',
-         'PluginFormcreatorForm'
-         );
+      __('Form Creator', 'formcreator'),
+      $_SERVER['PHP_SELF'],
+      'admin',
+      'PluginFormcreatorForm'
+   );
 
-   $itemtype = "PluginFormcreatorTargetChange";
-   $iterator = $DB->request([
-      'SELECT' => ['plugin_formcreator_forms_id'],
-      'FROM'   => PluginFormcreatorTarget::getTable(),
-      'WHERE'  => [
-         'itemtype' => $itemtype,
-         'items_id' => (int) $_REQUEST['id'],
-      ]
-   ]);
-   $first = $iterator->next();
-   $form     = new PluginFormcreatorForm;
-   $form->getFromDB($first['plugin_formcreator_forms_id']);
+   $itemtype = PluginFormcreatorTargetChange::class;
+   $targetchange->getFromDB((int) $_REQUEST['id']);
+   $form = $targetchange->getForm();
 
    $_SESSION['glpilisttitle'][$itemtype] = sprintf(__('%1$s = %2$s'),
          $form->getTypeName(1), $form->getName());

diff --git a/front/targetticket.form.php b/front/targetticket.form.php
@@ -77,18 +77,9 @@
       'PluginFormcreatorForm'
    );
 
-   $itemtype = "PluginFormcreatorTargetTicket";
-   $iterator = $DB->request([
-      'SELECT' => ['plugin_formcreator_forms_id'],
-      'FROM'   => PluginFormcreatorTarget::getTable(),
-      'WHERE'  => [
-         'itemtype' => $itemtype,
-         'items_id' => (int) $_REQUEST['id'],
-      ]
-   ]);
-   $first = $iterator->next();
-   $form     = new PluginFormcreatorForm;
-   $form->getFromDB($first['plugin_formcreator_forms_id']);
+   $itemtype = PluginFormcreatorTargetTicket::class;
+   $targetticket->getFromDB((int) $_REQUEST['id']);
+   $form = $targetticket->getForm();
 
    $_SESSION['glpilisttitle'][$itemtype] = sprintf(__('%1$s = %2$s'),
                                                    $form->getTypeName(1), $form->getName());

diff --git a/hook.php b/hook.php
@@ -417,6 +417,14 @@ function plugin_formcreator_hook_purge_ticket(CommonDBTM $item) {
    }
 }
 
+function plugin_formcreator_hook_pre_purge_targetTicket(CommonDBTM $item) {
+   $item->pre_purgeItem();
+}
+
+function plugin_formcreator_hook_pre_purge_targetChange(CommonDBTM $item) {
+   $item->pre_purgeItem();
+}
+
 function plugin_formcreator_dynamicReport($params) {
    switch ($params['item_type']) {
       case PluginFormcreatorFormAnswer::class;