mirror of
https://github.com/Karaka-Management/oms-Profile.git
synced 2026-02-15 06:48:41 +00:00
code fixes
This commit is contained in:
parent
eb2813e1d8
commit
e1533ac1e2
|
|
@ -15,7 +15,6 @@ declare(strict_types=1);
|
||||||
namespace Modules\Profile\Controller;
|
namespace Modules\Profile\Controller;
|
||||||
|
|
||||||
use Modules\Admin\Models\AccountMapper;
|
use Modules\Admin\Models\AccountMapper;
|
||||||
use Modules\Admin\Models\AddressMapper;
|
|
||||||
use Modules\Admin\Models\ContactType;
|
use Modules\Admin\Models\ContactType;
|
||||||
use Modules\Media\Models\MediaMapper;
|
use Modules\Media\Models\MediaMapper;
|
||||||
use Modules\Media\Models\NullMedia;
|
use Modules\Media\Models\NullMedia;
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ final class SearchController extends Controller
|
||||||
*/
|
*/
|
||||||
public function searchGeneral(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
|
public function searchGeneral(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
|
||||||
{
|
{
|
||||||
$names = \explode(' ', ($request->getDataString('search') ?? ''));
|
$names = \explode(' ', ($request->getDataString('search') ?? ''));
|
||||||
$names[] = ($request->getDataString('search') ?? '');
|
$names[] = ($request->getDataString('search') ?? '');
|
||||||
|
|
||||||
$mapper = ProfileMapper::getAll()
|
$mapper = ProfileMapper::getAll()
|
||||||
|
|
@ -70,7 +70,7 @@ final class SearchController extends Controller
|
||||||
/** @var \Model\Setting $profileImage */
|
/** @var \Model\Setting $profileImage */
|
||||||
$profileImage = $this->app->appSettings->get(names: SettingsEnum::DEFAULT_PROFILE_IMAGE, module: 'Profile');
|
$profileImage = $this->app->appSettings->get(names: SettingsEnum::DEFAULT_PROFILE_IMAGE, module: 'Profile');
|
||||||
|
|
||||||
/** @var \Modules\Media\Models\Media $image */
|
/** @var \Modules\Media\Models\Media $default */
|
||||||
$default = MediaMapper::get()
|
$default = MediaMapper::get()
|
||||||
->where('id', (int) $profileImage->content)
|
->where('id', (int) $profileImage->content)
|
||||||
->execute();
|
->execute();
|
||||||
|
|
@ -80,17 +80,17 @@ final class SearchController extends Controller
|
||||||
$address = empty($account->account->addresses) ? null : \reset($account->account->addresses);
|
$address = empty($account->account->addresses) ? null : \reset($account->account->addresses);
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => $account->account->name1 . ' ' . $account->account->name2,
|
'title' => $account->account->name1 . ' ' . $account->account->name2,
|
||||||
'link' => '{/base}/profile/view?id=' . $account->id,
|
'link' => '{/base}/profile/view?id=' . $account->id,
|
||||||
'email' => $account->account->getContactByType(ContactType::EMAIL)->content,
|
'email' => $account->account->getContactByType(ContactType::EMAIL)->content,
|
||||||
'phone' => $account->account->getContactByType(ContactType::PHONE)->content,
|
'phone' => $account->account->getContactByType(ContactType::PHONE)->content,
|
||||||
'city' => $address?->city,
|
'city' => $address?->city,
|
||||||
'image' => $account->image->id === 0
|
'image' => $account->image->id === 0
|
||||||
? $default->getPath()
|
? $default->getPath()
|
||||||
: $account->image->getPath(),
|
: $account->image->getPath(),
|
||||||
'tags' => [],
|
'tags' => [],
|
||||||
'type' => 'list_accounts',
|
'type' => 'list_accounts',
|
||||||
'module' => 'Profile',
|
'module' => 'Profile',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user