fix(form_validator): manage deletion of all items for a level

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Apr 1, 2021 · dc3dcf4 · dc3dcf4
1 parent 41320ba
commit dc3dcf4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/inc/form_validator.class.php b/inc/form_validator.class.php
@@ -273,7 +273,7 @@ public function post_deleteItem() {
          }
       }
 
-      if ($currentLevelCount < 1)  {
+      if ($currentLevelCount < 1) {
          // No more items for this level. Moving decreasing level of above levels
          foreach ($rows as $row) {
             if ($row['level'] < $this->fields['level']) {
@@ -569,8 +569,7 @@ public function getAvailableValidatorGroups() {
             "$profileRightTable.name" => "ticketvalidation",
             [
                'OR' => [
-                  "$profileRightTable.rights" => ['&', TicketValidation::VALIDATEREQUEST],
-                  "$profileRightTable.rights" => ['&', TicketValidation::VALIDATEINCIDENT],
+                  "$profileRightTable.rights" => ['&', TicketValidation::VALIDATEINCIDENT | TicketValidation::VALIDATEREQUEST],
                ],
             ],
             "$userTable.is_active" => '1',

diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php
@@ -434,7 +434,7 @@ public function canValidate(): bool {
       $rows = $formAnswerValidation->find(
          [
             self::getForeignKeyField() => $this->getID(),
-            'level' => ['>=', PluginFormcreatorFormAnswerValidation::getCurrentValidationLevel($this)],
+            'level' => ['<>', PluginFormcreatorFormAnswerValidation::getCurrentValidationLevel($this)],
          ],
          ['itemtype ASC']
       );
@@ -514,7 +514,7 @@ public function showForm($ID, $options = []) {
       $canEdit = $this->fields['status'] == self::STATUS_REFUSED
                  && Session::getLoginUserID() == $this->fields['requester_id']
                  || $this->fields['status'] == self::STATUS_WAITING
-                 && $this->canValidate() && $editMode;
+                 && $this->canValidate();
 
       // form title
       echo "<h1 class='form-title'>";
@@ -597,7 +597,7 @@ public function showForm($ID, $options = []) {
                   }
                }
             }
-            echo $question->getRenderedHtml($domain, $canEdit, $answers, $visibility[$question->getType()][$question->getID()]);
+            echo $question->getRenderedHtml($domain, $editMode, $answers, $visibility[$question->getType()][$question->getID()]);
             $lastQuestion = $question;
          }
          echo '</div>';

diff --git a/inc/formanswervalidation.class.php b/inc/formanswervalidation.class.php
@@ -81,7 +81,7 @@ public static function computeValidationStatus(PluginFormcreatorFormAnswer $form
       $result = $DB->request([
          'FROM' => self::getTable(),
          'WHERE' => [
-            $formAnswerFk => $formAnswer->fields['id'],
+            $formAnswerFk => $formAnswer->getID(),
          ],
          'GROUPBY' => ['level'],
       ]);
@@ -104,10 +104,7 @@ public static function computeValidationStatus(PluginFormcreatorFormAnswer $form
          'SELECT' => ['MAX' => 'level as level'],
          'FROM' => self::getTable(),
          'WHERE' => [
-            $formAnswerFk => $formAnswer->fields['id'],
-            ['NOT' => [
-               'status' => PluginFormcreatorForm_Validator::VALIDATION_STATUS_WAITING,
-            ]],
+            $formAnswerFk => $formAnswer->getID(),
          ],
       ];
       $max = $DB->request($request)->next();