Merge pull request #2613 from phili67/phili67-meta-engine-update

Meta search engine bug res
phili67 · Apr 16, 2024 · 3c6b3a6 · 3c6b3a6
2 parents 35c8129 + 7e35cf6
commit 3c6b3a6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/EcclesiaCRM/Search/DepositSearchRes.php b/src/EcclesiaCRM/Search/DepositSearchRes.php
@@ -33,7 +33,7 @@ public function buildSearch(string $qry)
             {
                 try {
                     $date = InputUtils::FilterDate($qry);
-                } catch (Exception $e) {
+                } catch (\Exception $e) {
                     $date = null;
                 }
 

diff --git a/src/EcclesiaCRM/Search/PersonCustomSearchRes.php b/src/EcclesiaCRM/Search/PersonCustomSearchRes.php
@@ -128,7 +128,7 @@ public function buildSearch(string $qry)
 
                                 $elt = [
                                     "id" => $per->getPerson()->getId(),
-                                    "img" => $per->getJPGPhotoDatas(),
+                                    "img" => $per->getPerson()->getJPGPhotoDatas(),
                                     "searchresult" => '<a href="' . SystemURLs::getRootPath() . '/v2/people/person/view/' . $per->getPerson()->getId() . '" data-toggle="tooltip" data-placement="top" title="' . _('Edit') . '">' . OutputUtils::FormatFullName($per->getPerson()->getTitle(), $per->getPerson()->getFirstName(), $per->getPerson()->getMiddleName(), $per->getPerson()->getLastName(), $per->getPerson()->getSuffix(), 3) . '</a>',
                                     "address" => (!SessionUser::getUser()->isSeePrivacyDataEnabled()) ? _('Private Data') : $address,
                                     "type" => " " . _($this->getGlobalSearchType()),

diff --git a/src/EcclesiaCRM/Search/PersonVolunteerOpportunitySearch.php b/src/EcclesiaCRM/Search/PersonVolunteerOpportunitySearch.php
@@ -121,6 +121,7 @@ public function buildSearch(string $qry)
                             $elt = [
                                 "id" => $per->getId(),
                                 "img" => $per->getJPGPhotoDatas(),
+                                "searchresult" => '<a href="' . SystemURLs::getRootPath() . '/v2/people/person/view/' . $per->getId() . '" data-toggle="tooltip" data-placement="top" title="' . _('Edit') . '">' . OutputUtils::FormatFullName($per->getTitle(), $per->getFirstName(), $per->getMiddleName(), $per->getLastName(), $per->getSuffix(), 3) . '</a>',
                                 "address" => (!SessionUser::getUser()->isSeePrivacyDataEnabled())?_('Private Data'):$address,
                                 "type" => " "._($this->getGlobalSearchType()),
                                 "realType" => $this->getGlobalSearchType(),

diff --git a/src/EcclesiaCRM/Search/PledgeSearchRes.php b/src/EcclesiaCRM/Search/PledgeSearchRes.php
@@ -58,15 +58,16 @@ public function buildSearch(string $qry)
                         $id=1;
 
                         foreach ($Pledges as $Pledge) {
+                            $uri = SystemURLs::getRootPath() . "/v2/deposit/pledge/editor/GroupKey/".$Pledge->getGroupkey()."/v2-deposit-slipeditor-" . $Pledge->getDepositId();
                             if ( $this->isQuickSearch() ) {
                                 $elt = ['id' => 'pledges-' . $id++,
                                     'text' => $Pledge->getFamily()->getName() . " (" . _("Deposit") . " #" . $Pledge->getDepositId() . ")",
-                                    'uri' => SystemURLs::getRootPath() . "/v2/deposit/pledge/editor/GroupKey/".$Pledge->getGroupkey()."/v2-deposit-slipeditor-" . $Pledge->getDepositId()];
+                                    'uri' => $uri];
                             } else {
                                 if (!is_null($Pledge->getDepositId())) {
                                     $res = "";
                                     if (SessionUser::getUser()->isShowCartEnabled()) {
-                                        $res = '<a href="' . $elt['uri'] . '" data-toggle="tooltip" data-placement="top" title="' . _('Edit') . '">';
+                                        $res = '<a href="' . $uri . '" data-toggle="tooltip" data-placement="top" title="' . _('Edit') . '">';
                                     }
 
                                     $res .= '<span class="fa-stack">'