mirror of
https://github.com/Karaka-Management/phpOMS.git
synced 2026-02-03 19:28:41 +00:00
Request language added
This commit is contained in:
parent
733c61418a
commit
34ec16c6a9
|
|
@ -1819,7 +1819,7 @@ class DataMapperAbstract implements DataMapperInterface
|
||||||
public static function getByRequest(RequestAbstract $request)
|
public static function getByRequest(RequestAbstract $request)
|
||||||
{
|
{
|
||||||
if (!is_null($request->getData('id'))) {
|
if (!is_null($request->getData('id'))) {
|
||||||
$result = static::get($request->getData('id'))->__toString();
|
$result = static::get($request->getData('id'), $request->getLanguage())->__toString();
|
||||||
} elseif (!is_null($filter = $request->getData('filter'))) {
|
} elseif (!is_null($filter = $request->getData('filter'))) {
|
||||||
$filter = strtolower($filter);
|
$filter = strtolower($filter);
|
||||||
|
|
||||||
|
|
@ -1827,7 +1827,7 @@ class DataMapperAbstract implements DataMapperInterface
|
||||||
$result = static::getAll();
|
$result = static::getAll();
|
||||||
} elseif ($filter === 'list') {
|
} elseif ($filter === 'list') {
|
||||||
$list = $request->getData('list');
|
$list = $request->getData('list');
|
||||||
$result = static::get(json_decode($list, true));
|
$result = static::get(json_decode($list, true), $request->getLanguage());
|
||||||
} else {
|
} else {
|
||||||
$limit = $request->getData('limit') ?? 1;
|
$limit = $request->getData('limit') ?? 1;
|
||||||
$from = !is_null($request->getData('from')) ? new \DateTime($request->getData('from')) : null;
|
$from = !is_null($request->getData('from')) ? new \DateTime($request->getData('from')) : null;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user