squash last commits

Author: SebSept

front/ticket.form.php

@@ -42,7 +42,7 @@
 
 global $CFG_GLPI, $DB;
 
-$track = new Ticket();
+$ticket = new Ticket();
 
 if (!isset($_GET['id'])) {
     $_GET['id'] = "";
@@ -66,33 +66,37 @@
     }
 }
 
+// form submitted (add & update)
 // as _actors virtual field stores json, bypass automatic escaping
 if (isset($_POST['_actors'])) {
     $_POST['_actors'] = json_decode($_POST['_actors'], true);
     $_REQUEST['_actors'] = $_POST['_actors'];
 }
 
+// form submitted (add)
 if (isset($_POST["add"])) {
-    $track->check(-1, CREATE, $_POST);
+    $ticket->check(-1, CREATE, $_POST);
 
-    if ($track->add($_POST)) {
+    if ($ticket->add($_POST)) {
         if ($_SESSION['glpibackcreated']) {
-            Html::redirect($track->getLinkURL());
+            Html::redirect($ticket->getLinkURL());
         }
     }
     Html::back();
-} elseif (isset($_POST['update'])) {
-    if (!$track::canUpdate()) {
+}
+// form submitted (update)
+elseif (isset($_POST['update'])) {
+    if (!$ticket::canUpdate()) {
         throw new AccessDeniedHttpException();
     }
-    $track->update($_POST);
+    $ticket->update($_POST);
 
     if (isset($_POST['kb_linked_id'])) {
         //if solution should be linked to selected KB entry
         $params = [
             'knowbaseitems_id' => $_POST['kb_linked_id'],
-            'itemtype'         => $track->getType(),
-            'items_id'         => $track->getID(),
+            'itemtype'         => $ticket->getType(),
+            'items_id'         => $ticket->getID(),
         ];
         $existing = $DB->request([
             'FROM' => 'glpi_knowbaseitems_items',
@@ -113,23 +117,25 @@
         sprintf(__('%s updates an item'), $_SESSION["glpiname"])
     );
 
-    if ($track->can($_POST["id"], READ)) {
+    if ($ticket->can($_POST["id"], READ)) {
         $toadd = '';
         // Copy solution to KB redirect to KB
         if (isset($_POST['_sol_to_kb']) && $_POST['_sol_to_kb']) {
             $toadd = "&_sol_to_kb=1";
         }
         Html::redirect(Ticket::getFormURLWithID($_POST["id"]) . $toadd);
     }
+
+    // in case user can update the ticket but not read it, redirect to the ticket list
     Session::addMessageAfterRedirect(
         __s('You have been redirected because you no longer have access to this ticket'),
         true,
         ERROR
     );
     Html::redirect($CFG_GLPI["root_doc"] . "/front/ticket.php");
 } elseif (isset($_POST['delete'])) {
-    $track->check($_POST['id'], DELETE);
-    if ($track->delete($_POST)) {
+    $ticket->check($_POST['id'], DELETE);
+    if ($ticket->delete($_POST)) {
         Event::log(
             $_POST["id"],
             "ticket",
@@ -139,10 +145,10 @@
             sprintf(__('%s deletes an item'), $_SESSION["glpiname"])
         );
     }
-    $track->redirectToList();
+    $ticket->redirectToList();
 } elseif (isset($_POST['purge'])) {
-    $track->check($_POST['id'], PURGE);
-    if ($track->delete($_POST, true)) {
+    $ticket->check($_POST['id'], PURGE);
+    if ($ticket->delete($_POST, true)) {
         Event::log(
             $_POST["id"],
             "ticket",
@@ -152,10 +158,10 @@
             sprintf(__('%s purges an item'), $_SESSION["glpiname"])
         );
     }
-    $track->redirectToList();
+    $ticket->redirectToList();
 } elseif (isset($_POST["restore"])) {
-    $track->check($_POST['id'], DELETE);
-    if ($track->restore($_POST)) {
+    $ticket->check($_POST['id'], DELETE);
+    if ($ticket->restore($_POST)) {
         Event::log(
             $_POST["id"],
             "ticket",
@@ -167,23 +173,9 @@
     }
     Html::back();
 } elseif (isset($_POST['sla_delete'])) {
-    $track->check($_POST["id"], UPDATE);
-
-    $track->deleteLevelAgreement("SLA", $_POST["id"], $_POST['type'], $_POST['delete_date']);
-    Event::log(
-        $_POST["id"],
-        "ticket",
-        4,
-        "tracking",
-        //TRANS: %s is the user login
-        sprintf(__('%s updates an item'), $_SESSION["glpiname"])
-    );
-
-    Html::redirect(Ticket::getFormURLWithID($_POST["id"]));
-} elseif (isset($_POST['ola_delete'])) {
-    $track->check($_POST["id"], UPDATE);
+    $ticket->check($_POST["id"], UPDATE);
 
-    $track->deleteLevelAgreement("OLA", $_POST["id"], $_POST['type'], $_POST['delete_date']);
+    $ticket->deleteLevelAgreement("SLA", $_POST["id"], $_POST['type'], $_POST['delete_date']);
     Event::log(
         $_POST["id"],
         "ticket",
@@ -196,16 +188,16 @@
     Html::redirect(Ticket::getFormURLWithID($_POST["id"]));
 } elseif (isset($_POST['addme_as_actor'])) {
     $id = (int) $_POST['id'];
-    $track->check($id, READ);
-    $input = array_merge($track->fields, [
+    $ticket->check($id, READ);
+    $input = array_merge($ticket->fields, [
         'id' => $id,
         '_itil_' . $_POST['actortype'] => [
             '_type' => "user",
             'users_id' => Session::getLoginUserID(),
             'use_notification' => 1,
         ],
     ]);
-    $track->update($input);
+    $ticket->update($input);
     Event::log(
         $id,
         "ticket",
@@ -216,13 +208,13 @@
     );
     Html::redirect(Ticket::getFormURLWithID($id));
 } elseif (isset($_POST['delete_document'])) {
-    $track->getFromDB((int) $_POST['tickets_id']);
+    $ticket->getFromDB((int) $_POST['tickets_id']);
     $doc = new Document();
     $doc->getFromDB((int) $_POST['documents_id']);
     if ($doc->can($doc->getID(), UPDATE)) {
         $document_item = new Document_Item();
         $found_document_items = $document_item->find([
-            $track->getAssociatedDocumentsCriteria(),
+            $ticket->getAssociatedDocumentsCriteria(),
             'documents_id' => $doc->getID(),
         ]);
         foreach ($found_document_items as $item) {
@@ -232,6 +224,7 @@
     Html::back();
 }
 
+// show form when editing a ticket
 $id = (int) $_GET['id'];
 if ($id > 0) {
     $available_options = ['_openfollowup'];
@@ -287,7 +280,7 @@
 
     if (isset($_GET['showglobalkanban']) && $_GET['showglobalkanban']) {
         Html::header(sprintf(__('%s Kanban'), Ticket::getTypeName(1)), '', "helpdesk", "ticket");
-        $track::showKanban(0);
+        $ticket::showKanban(0);
         Html::footer();
     } else {
         $menus = ["helpdesk", "ticket"];

inc/relation.constant.php

@@ -750,6 +750,7 @@
         'glpi_tickettasks'            => 'groups_id_tech',
         'glpi_users'                  => 'groups_id',
         'glpi_itilvalidationtemplates_targets' => 'groups_id',
+        'glpi_olas'                   => 'groups_id',
     ],
 
     'glpi_holidays' => [
@@ -1033,15 +1034,11 @@
         '_glpi_olalevelactions'   => 'olalevels_id',
         '_glpi_olalevelcriterias' => 'olalevels_id',
         '_glpi_olalevels_tickets' => 'olalevels_id',
-        'glpi_tickets'            => 'olalevels_id_ttr',
     ],
 
     'glpi_olas' => [
         'glpi_olalevels' => 'olas_id',
-        'glpi_tickets'   => [
-            'olas_id_ttr',
-            'olas_id_tto',
-        ],
+        '_glpi_items_olas' => 'olas_id',
     ],
 
     'glpi_operatingsystemarchitectures' => [

install/empty_data.php

@@ -753,7 +753,7 @@ public function getEmptyData(): array
                 'hourmax' => 24,
             ], [
                 'id' => 32,
-                'itemtype' => 'OlaLevel_Ticket',
+                'itemtype' => 'Item_Ola',
                 'name' => 'olaticket',
                 'frequency' => 5 * MINUTE_TIMESTAMP,
                 'param' => null,