fix: [audit-logs:eventIndex] Fixed pagination issue while viewing eve…

…nt history Fix #9726
MISP · May 14, 2024 · d346b6c · d346b6c
1 parent 05d8947
commit d346b6c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/app/Controller/AuditLogsController.php b/app/Controller/AuditLogsController.php
@@ -155,16 +155,21 @@ public function admin_index()
         $this->set('title_for_layout', __('Audit logs'));
     }
 
-    public function eventIndex($eventId, $org = null)
+    public function eventIndex($eventId = null, $org = null)
     {
+        $params = $this->IndexFilter->harvestParameters(['created', 'org', 'eventId']);
+        if (!empty($params['eventId'])) {
+            $eventId = $params['eventId'];
+        } else if (empty($eventId)) {
+            $eventId = -1;
+        }
         $event = $this->AuditLog->Event->fetchSimpleEvent($this->Auth->user(), $eventId);
         if (empty($event)) {
             throw new NotFoundException('Invalid event.');
         }
         $this->paginate['conditions'] = $this->__createEventIndexConditions($event);
         $this->set('passedArgsArray', ['eventId' => $eventId, 'org' => $org]);
 
-        $params = $this->IndexFilter->harvestParameters(['created', 'org']);
         if ($org) {
             $params['org'] = $org;
         }