gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 02:21:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v6.2' of github.com:firefly-iii/firefly-iii into v6.2

Browse Source 
# Conflicts:
#	app/Api/V2/Controllers/Model/ExchangeRate/ShowController.php
#	app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php
#	routes/api.php
This commit is contained in:
James Cole
2024-12-22 08:28:44 +01:00
parent f5a755d4fc a500de8ab1
commit 5751f7e5a3
66 changed files with 234 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Api/V2/Controllers/Model/ExchangeRate/ShowController.php
View File

@@ -37,8 +37,8 @@ use Illuminate\Pagination\LengthAwarePaginator;
*/
class ShowController extends Controller
{
public const string RESOURCE_KEY = 'exchange-rates';
use ValidatesUserGroupTrait;
public const string RESOURCE_KEY = 'exchange-rates';
private ExchangeRateRepositoryInterface $repository;
@@ -61,7 +61,6 @@ class ShowController extends Controller
$page = $this->parameters->get('page');
$rates = $this->repository->getRates($from, $to);
$count = $rates->count();
$rates = $rates->slice(($page - 1) * $pageSize, $pageSize);
$paginator = new LengthAwarePaginator($rates, $count, $pageSize, $page);
@@ -70,6 +69,7 @@ class ShowController extends Controller
return response()
->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))
->header('Content-Type', self::CONTENT_TYPE);
->header('Content-Type', self::CONTENT_TYPE)
;
}
}