From 359e13260fe21150ab474d6e77b5bac88760eaa5 Mon Sep 17 00:00:00 2001 From: Ignacio Martinez Navajas Date: Thu, 15 May 2025 18:02:32 +0200 Subject: [PATCH] Fixed campo secret para obtener el email --- ci4/app/Models/Sistema/ActivityModel.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ci4/app/Models/Sistema/ActivityModel.php b/ci4/app/Models/Sistema/ActivityModel.php index 21f22d47..fa0704f3 100755 --- a/ci4/app/Models/Sistema/ActivityModel.php +++ b/ci4/app/Models/Sistema/ActivityModel.php @@ -20,7 +20,7 @@ class ActivityModel extends BaseModel const SORTABLE = [ 1 => "t1.id", - 2 => "t2.username", + 2 => "t3.secret", 3 => "t1.level", 4 => "t1.event", 5 => "t1.ip", @@ -55,10 +55,17 @@ class ActivityModel extends BaseModel $builder = $this->db ->table($this->table . " t1") ->select( - "t1.id AS id, t2.username AS user, t1.level AS level, t1.event AS event, t1.ip AS ip, t1.os AS os, - t1.browser AS browser, t1.created_at AS created_at" + "t1.id AS id, + t3.secret AS user, + t1.level AS level, + t1.event AS event, + t1.ip AS ip, + t1.os AS os, + t1.browser AS browser, + t1.created_at AS created_at" ) ->join("users t2", "t1.user_id = t2.id", "left") + ->join("auth_identities t3", "t3.user_id = t2.id AND t3.type = 'email_password'", "left") ->orderBy('t1.created_at', 'DESC'); return empty($search) @@ -66,7 +73,7 @@ class ActivityModel extends BaseModel : $builder ->groupStart() ->like("t1.id", $search) - ->orLike("t2.username", $search) + ->orLike("t3.secret", $search) ->orLike("t1.level", $search) ->orLike("t1.event", $search) ->orLike("t1.ip", $search)