Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2024-11-11 01:19:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix search

Browse source
This commit is contained in:
Jill Stingray 2020-06-23 20:02:52 +00:00
parent b7c914f35d
commit 6bf1c9bb29
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Web/Models/Repositories/Users.php
View file

@ -38,16 +38,16 @@ class Users
function find(string $query, int $page = 1, ?int $perPage = NULL): \Traversable function find(string $query, int $page = 1, ?int $perPage = NULL): \Traversable
{ {
$query = "$query%"; $query = "%$query%";
$perPage = $perPage ?? OPENVK_DEFAULT_PER_PAGE; $perPage = $perPage ?? OPENVK_DEFAULT_PER_PAGE;
foreach($this->users->where("first_name LIKE ? OR last_name LIKE ?", $query,$query)->page($page, $perPage) as $result) foreach($this->users->where("CONCAT_WS(' ', first_name, last_name) LIKE ?", $query)->page($page, $perPage) as $result)
yield new User($result); yield new User($result);
} }
function getFoundCount(string $query): int function getFoundCount(string $query): int
{ {
$query = "$query%"; $query = "%$query%";
return sizeof($this->users->where("first_name LIKE ? OR last_name LIKE ?", $query, $query)); return sizeof($this->users->where("CONCAT_WS(' ', first_name, last_name) LIKE ?", $query));
} }
function getStatistics(): object function getStatistics(): object

2
Web/Presenters/templates/@layout.xml
View file

@ -69,7 +69,7 @@
<a href="/logout">{_"header_log_out"}</a> <a href="/logout">{_"header_log_out"}</a>
</div> </div>
<div class="link"> <div class="link">
<form action="search" method="get"> <form action="/search" method="get">
<input type="search" name="query" placeholder="{_"header_search"}" style="background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; padding-left: 18px;width: 120px;" /> <input type="search" name="query" placeholder="{_"header_search"}" style="background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; padding-left: 18px;width: 120px;" />
</form> </form>
</div> </div>