mail history grid update

skaut · Oct 18, 2023 · 90458d9 · 90458d9
1 parent 256bf47
commit 90458d9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/app/AdminModule/MailingModule/Components/MailHistoryGridControl.php b/app/AdminModule/MailingModule/Components/MailHistoryGridControl.php
@@ -49,6 +49,14 @@ public function createComponentMailHistoryGrid(string $name): void
         $grid->setItemsPerPageList([25, 50, 100, 250, 500]);
         $grid->setStrictSessionFilterValues(false);
 
+        $grid->addColumnText('recipientUsers', 'admin.mailing.history.recipient_users', 'recipientUsersText')
+            ->setFilterText()
+            ->setCondition(static function (QueryBuilder $qb, string $value): void {
+                $qb->join('m.recipientUsers', 'u')
+                    ->andWhere('u.displayName LIKE :displayName')
+                    ->setParameter('displayName', '%' . $value . '%');
+            });
+
         $grid->addColumnText('recipientRoles', 'admin.mailing.history.recipient_roles', 'recipientRolesText')
             ->setFilterMultiSelect($this->aclService->getRolesWithoutRolesOptions([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
             ->setCondition(static function (QueryBuilder $qb, ArrayHash $values): void {
@@ -65,12 +73,11 @@ public function createComponentMailHistoryGrid(string $name): void
                     ->setParameter('sids', (array) $values);
             });
 
-        $grid->addColumnText('recipientUsers', 'admin.mailing.history.recipient_users', 'recipientUsersText')
+        $grid->addColumnText('recipientEmails', 'admin.mailing.history.recipient_emails', 'recipientEmailsText')
             ->setFilterText()
             ->setCondition(static function (QueryBuilder $qb, string $value): void {
-                $qb->join('m.recipientUsers', 'u')
-                    ->andWhere('u.displayName LIKE :displayName')
-                    ->setParameter('displayName', '%' . $value . '%');
+                $qb->andWhere('m.recipientUsers LIKE :email')
+                    ->setParameter('email', $value);
             });
 
         $grid->addColumnText('subject', 'admin.mailing.history.subject')

diff --git a/app/Model/Mailing/Mail.php b/app/Model/Mailing/Mail.php
@@ -175,6 +175,11 @@ public function setRecipientEmails(array $recipientEmails): void
         $this->recipientEmails = $recipientEmails;
     }
 
+    public function getRecipientEmailsText(): string
+    {
+        return implode(', ', $this->recipientEmails);
+    }
+
     public function getSubject(): string
     {
         return $this->subject;