fix(issue): remove redundant condition

filtering against the current user is done in addDefaultWhere()

Author: btry

inc/formanswer.class.php

@@ -1353,6 +1353,8 @@ private function createIssue() {
             'entities_id'        => $this->fields['entities_id'],
             'is_recursive'       => $this->fields['is_recursive'],
             'requester_id'       => $this->fields['requester_id'],
+            'users_id_validator' => $this->fields['users_id_validator'],
+            'groups_id_validator'=> $this->fields['groups_id_validator'],
             'comment'            => '',
          ]);
 
@@ -1455,6 +1457,8 @@ private function updateIssue() {
             'entities_id'        => $this->fields['entities_id'],
             'is_recursive'       => $this->fields['is_recursive'],
             'requester_id'       => $this->fields['requester_id'],
+            'users_id_validator' => $this->fields['users_id_validator'],
+            'groups_id_validator'=> $this->fields['groups_id_validator'],
             'comment'            => '',
          ]);
 

inc/issue.class.php

@@ -712,7 +712,7 @@ public function rawSearchOptions() {
       }
 
       if (Plugin::isPluginActive('advform')) {
-         foreach (PluginADvformIssue::rawSearchOptions() as $so) {
+         foreach (PluginAdvformIssue::rawSearchOptions() as $so) {
             $tab[] = $so;
          }
       }
@@ -883,66 +883,44 @@ static function getValidateCriteria() {
                               'searchtype' => 'equals',
                               'value'      => PluginFormcreatorFormAnswer::STATUS_WAITING,
                               ],
-                             ['link' => 'AND'] + self::getMeAsValidatorCriteria()
                             ],
               'reset'    => 'reset'];
    }
 
    static function getSolvedCriteria() {
       $currentUser = Session::getLoginUserID();
       return ['criteria' => [
-                              ['link'       => 'AND',
-                              'criteria' => [[
-                               'link'       => 'AND',
-                               'field' => 4,
-                               'searchtype' => 'equals',
-                               'value'      => 'old', // see Ticket::getAllStatusArray()
-                              ],
-                              ['field' => 4,
-                               'searchtype' => 'equals',
-                               'value'      => PluginFormcreatorFormAnswer::STATUS_REFUSED,
-                               'link'       => 'OR']
-                              ]],
-                              ['link'       => 'OR',
-                              'criteria' => [[
-                                 'link'       => 'AND',
-                                 'field'      => 9,
-                                 'searchtype' => 'equals',
-                                 'value'      => $currentUser,
-                              ],
-                              ['link'       => 'OR',
-                                 'field'      => 16,
-                                 'searchtype' => 'equals',
-                                 'value'      => 'mygroups',
-                              ],
-                              ]],
-                              ['link'       => 'AND',
-                                 'field' => 4,
-                                 'searchtype' => 'equals',
-                                 'value'      => PluginFormcreatorFormAnswer::STATUS_REFUSED,
-                              ]],
-              'reset'    => 'reset'];
-   }
-
-   public static function getMeAsValidatorCriteria() {
-      $currentUser = Session::getLoginUserID();
-      return ['criteria'   => [[
-         'link'       => 'AND',
-         'field'      => 18,
-         'searchtype' => 'equals',
-         'value'      => $currentUser,
-        ],
-        ['link'       => 'OR',
-         'field'      => 17,
-         'searchtype' => 'equals',
-         'value'      => 'mygroups',
-        ],
-        ['link'       => 'OR',
-         'field'      => 11,
-         'searchtype' => 'equals',
-         'value'      => $currentUser,
-        ]]
-      ];
+         ['link'       => 'AND',
+         'criteria' => [[
+            'link'       => 'AND',
+            'field' => 4,
+            'searchtype' => 'equals',
+            'value'      => 'old', // see Ticket::getAllStatusArray()
+         ],
+         ['field' => 4,
+            'searchtype' => 'equals',
+            'value'      => PluginFormcreatorFormAnswer::STATUS_REFUSED,
+            'link'       => 'OR']
+         ]],
+         ['link'       => 'OR',
+         'criteria' => [[
+            'link'       => 'AND',
+            'field'      => 9,
+            'searchtype' => 'equals',
+            'value'      => $currentUser,
+         ],
+         ['link'       => 'OR',
+            'field'      => 16,
+            'searchtype' => 'equals',
+            'value'      => 'mygroups',
+         ],
+         ]],
+         ['link'       => 'AND',
+            'field' => 4,
+            'searchtype' => 'equals',
+            'value'      => PluginFormcreatorFormAnswer::STATUS_REFUSED,
+         ]],
+      'reset'    => 'reset'];
    }
 
    static function getTicketSummary(?string $counter = null) {