Massive action + massive performance repair

ajax/dropdownAllItems.php

@@ -39,61 +39,30 @@
 
 // Make a select box
 if ($_POST["idtable"] && class_exists($_POST["idtable"])) {
-   // Link to user for search only > normal users
-   $link = "getDropdownValue.php";
-
-   if ($_POST["idtable"] == 'User') {
-      $link = "getDropdownUsers.php";
-   }
-
-   $rand     = mt_rand();
-   if (isset($_POST['rand'])) {
-      $rand = $_POST['rand'];
-   }
-
-   $field_id = Html::cleanId("dropdown_".$_POST["name"].$rand);
-
-   $p        = [
-      'value'               => 0,
-      'valuename'           => Dropdown::EMPTY_VALUE,
-      'itemtype'            => $_POST["idtable"],
-      'display_emptychoice' => true,
-      'displaywith'         => ['otherserial', 'serial'],
-      '_idor_token'         => Session::getNewIDORToken($_POST["idtable"]),
-   ];
-   if (isset($_POST['value'])) {
-      $p['value'] = $_POST['value'];
-   }
    if (isset($_POST['entity_restrict'])) {
-      $p['entity_restrict'] = $_POST['entity_restrict'];
+      $entity_restrict = $_POST['entity_restrict'];
    }
    if (isset($_POST['condition'])) {
-      $p['condition'] = $_POST['condition'];
+      $condition = $_POST['condition'];
    }
+
+   $isDevice  = strpos($_POST["idtable"], "Device") === 0;
+   $values = getOptionForItems($_POST['idtable'], ($condition ?? []) + (isset($entity_restrict)
+      ? ['entities_id' => $_POST['entity_restrict']] : []), true, $isDevice);
+
    if (isset($_POST['used'])) {
       $_POST['used'] = Toolbox::jsonDecode($_POST['used'], true);
    }
    if (isset($_POST['used'][$_POST['idtable']])) {
-      $p['used'] = $_POST['used'][$_POST['idtable']];
-   }
-   if (isset($_POST['width'])) {
-      $p['width'] = $_POST['width'];
-   }
-
-   echo  Html::jsAjaxDropdown($_POST["name"], $field_id,
-                              $CFG_GLPI['root_doc']."/ajax/".$link,
-                              $p);
-
-   if (!empty($_POST['showItemSpecificity'])) {
-      $params = ['items_id' => '__VALUE__',
-                      'itemtype' => $_POST["idtable"]];
-      if (isset($_POST['entity_restrict'])) {
-         $params['entity_restrict'] = $_POST['entity_restrict'];
+      $used = $_POST['used'][$_POST['idtable']];
+      if (isset($used)) {
+         foreach($used as $usedId) {
+            if (isset($values[$usedId])) {
+               unset($values[$usedId]);
+            }
+         }
       }
-
-      Ajax::updateItemOnSelectEvent($field_id, "showItemSpecificity_".$_POST["name"]."$rand",
-                                    $_POST['showItemSpecificity'], $params);
-
-      echo "<br><span id='showItemSpecificity_".$_POST["name"]."$rand'>&nbsp;</span>\n";
    }
+
+   echo json_encode($values);
 }

ajax/dropdownItilActors.php

@@ -45,7 +45,9 @@
    $withemail = isset($_POST['allow_email']) && filter_var($_POST['allow_email'], FILTER_VALIDATE_BOOLEAN);
 
    $ticket = new Ticket();
-   $ticket->getFromDB($_POST['ticketId']);
+   if (isset($_POST['ticketId']) && $_POST['ticketId'] > 0) {
+      $ticket->getFromDB($_POST['ticketId']);
+   }
    if ($item = getItemForItemtype($_POST["itemtype"])) {
       switch ($_POST["type"]) {
          case "user" :
@@ -58,12 +60,15 @@
                }
             }
 
-            $forbiddenActors = $ticket->getUsers($_POST['actorTypeId']);
-            $forbiddenActors = array_filter($forbiddenActors, function($actor) {
-               return isset($actor['users_id']);
-            });
-            $options = getOptionsForUsers($right);
+            $forbiddenActors = [];
+            if (isset($_POST['actorTypeId'])) {
+               $forbiddenActors = $ticket->getUsers($_POST['actorTypeId']);
+               $forbiddenActors = array_filter($forbiddenActors, function($actor) {
+                  return isset($actor['users_id']);
+               });
+            }
             $forbiddenActors = array_column($forbiddenActors, 'users_id');
+            $options = getOptionsForUsers($right);
             $options = array_diff_key($options, array_combine($forbiddenActors, $forbiddenActors));
             echo json_encode($options);
 
@@ -82,12 +87,15 @@
               $cond['entities_id'] = $_POST['entity_restrict'];
             }
 
-            $forbiddenActors = $ticket->getGroups($_POST['actorTypeId']);
-            $forbiddenActors = array_filter($forbiddenActors, function($actor) {
-               return isset($actor['groups_id']);
-            });
-            $options = getOptionForItems('Group');
+            $forbiddenActors = [];
+            if (isset($_POST['actorTypeId'])) {
+               $forbiddenActors = $ticket->getUsers($_POST['actorTypeId']);
+               $forbiddenActors = array_filter($forbiddenActors, function($actor) {
+                  return isset($actor['users_id']);
+               });
+            }
             $forbiddenActors = array_column($forbiddenActors, 'groups_id');
+            $options = getOptionForItems('Group');
             $options = array_diff_key($options, array_combine($forbiddenActors, $forbiddenActors));
             echo json_encode($options);
             break;

ajax/dropdownMassiveActionAddActor.php

@@ -39,9 +39,9 @@
 Session::checkRight('ticket', UPDATE);
 
 if ($_POST["actortype"] > 0) {
-   $ticket = new Ticket();
-   $rand   = mt_rand();
-   $ticket->showActorAddForm($_POST["actortype"], $rand, $_SESSION['glpiactive_entity'], [],
-                             true, false, false);
-   echo "&nbsp;<input type='submit' name='add_actor' class='submit' value=\""._sx('button', 'Add')."\">";
+   $types = ['user'  => User::getTypeName(1)];
+   if ($withgroup) {
+      $types['group'] = Group::getTypeName(1);
+   }
+   echo json_encode($types);
 }

ajax/dropdownMassiveActionOs.php

@@ -41,6 +41,4 @@
    exit();
 }
 
-$item::dropdown();
-echo "<br/><input type='submit' name='update' value=\""._sx('button', 'Update')."\" class='submit'>";
-echo "<br/><input type='submit' name='clone' value=\""._sx('button', 'Clone')."\" class='submit'>";
+echo json_encode(['name' => $item::getForeignKeyField(), 'options' => getOptionForItems($item::class)]);

ajax/dropdownProjectTaskTicket.php

@@ -47,18 +47,19 @@
       $condition['glpi_projecttasks.projects_id'] = $_POST['projects_id'];
    }
 
-   $p = ['itemtype'     => ProjectTask::getType(),
-         'entity_restrict' => $_POST['entity_restrict'],
-         'myname'          => $_POST["myname"],
-         'condition'       => $condition,
-         'rand'            => $_POST["rand"]];
+   if (isset($_POST['entity_restrict']) && $_POST['entity_restrict'] > 0) {
+      $condition['glpi_projecttasks.entities_id'] = $_POST['entity_restrict'];
+   }
 
+   $values = getOptionForItems(ProjectTask::class, $condition);
    if (isset($_POST["used"]) && !empty($_POST["used"])) {
-      if (isset($_POST["used"])) {
-         $p["used"] = $_POST["used"];
+      $used = $_POST["used"];
+      foreach ($used as $key => $value) {
+         if (isset($values[$key])) {
+            unset($values[$key]);
+         }
       }
    }
 
-   ProjectTask::dropdown($p);
-
+   echo json_encode($values);
 }

ajax/dropdownRubDocument.php

@@ -59,22 +59,16 @@
       }
    }
 
-   if (preg_match('/[^a-z_\-0-9]/i', $_POST['myname'])) {
-      throw new \RuntimeException('Invalid name provided!');
-   }
-
    if (!isset($_POST['entity']) || $_POST['entity'] === '') {
       $_POST['entity'] = $_SESSION['glpiactive_entity'];
    }
+   $values = getOptionForItems(Document::class, [
+      'entities_id' => intval($_POST['entity']),
+      'glpi_documents.documentcategories_id' => (int)$_POST["rubdoc"]
+   ]);
+   foreach ($used as $id) {
+      unset($values[$id]);
+   }
 
-   Dropdown::show(
-      'Document', [
-         'name'      => $_POST['myname'],
-         'used'      => $used,
-         'width'     => '50%',
-         'entity'    => intval($_POST['entity']),
-         'rand'      => intval($_POST['rand']),
-         'condition' => ['glpi_documents.documentcategories_id' => (int)$_POST["rubdoc"]]
-      ]
-   );
+   echo json_encode($values);
 }

ajax/selectUnaffectedOrNewItem_Device.php

@@ -67,25 +67,14 @@
          ]
       ]
    );
-   echo "<table width='100%'><tr><td>" . __('Choose an existing device') . "</td><td rowspan='2'>" .
-        __('and/or') . "</td><td>" . __('Add new devices') . '</td></tr>';
-   echo "<tr><td>";
-   if ($result->count() == 0) {
-      echo __('No unaffected device !');
-   } else {
-      $devices = [];
-      foreach ($result as $row) {
-         $name = $row['name'];
-         if (empty($name)) {
-            $name = $row['id'];
-         }
-         $devices[$row['id']] = $name;
-
+   $devices = [];
+   foreach ($result as $row) {
+      $name = $row['name'];
+      if (empty($name)) {
+         $name = $row['id'];
       }
-      Dropdown::showFromArray($linktype::getForeignKeyField(), $devices, ['multiple' => true]);
-   }
-   echo "</td><td>";
-   Dropdown::showNumber('new_devices', ['min'   => 0, 'max'   => 10]);
-   echo "</td></tr></table>";
+      $devices[$row['id']] = $name;
 
+   }
+   echo json_encode(['name' => $devicetype::getForeignKeyField(), 'options' => $devices]);
 }

ajax/updateUserMenu.php

@@ -38,11 +38,10 @@
 
 if (
     isset($_POST['itemName'])
-    && isset($_POST['content'])
 ) {
     $userId = Session::getLoginUserID();
     $itemName = $_POST['itemName'];
-    $content = json_encode($_POST['content']);
+    $content = json_encode($_POST['content'] ?? '');
     $DB->query(<<<SQL
         INSERT INTO `glpi_user_menu` (name, user_id, content)
             VALUES ('$itemName', $userId, '$content')

css/itsm2.scss

@@ -1213,3 +1213,24 @@ div.chip>p {
 .dropdown-checkbox-toggle[aria-expanded="true"] i {
     rotate: 90deg;
 }
+
+/******************************************************/
+/*                        MODALS                      */
+/******************************************************/
+.ui-dialog {
+    border-radius: .5rem;
+    padding: 0;
+
+    .ui-dialog-titlebar {
+        background-color: $header-background-color;
+        color: $header-text-color;
+        border: 0;
+        border-radius: .5rem .5rem 0 0;
+        width: 100%;
+    }
+}
+
+.ui-widget.ui-widget-content {
+    border: 0;
+    border-radius: .5rem;
+}

css/palettes/_itsmng.scss

@@ -49,10 +49,6 @@
 
 /* ====== GENERAL ====== */
 
-.ui-widget-content a {
-   color: #ae0c2a;
-}
-
 .main_form tr.headerRow th {
    color: #c70c2f;
 }

css/styles.scss

@@ -2565,7 +2565,6 @@ a.icon_nav_move {
 
 .boxnote {
    margin: 0 auto;
-   width: 950px;
    text-align: left;
    border-radius: 10px;
    background: #e7e7e2;