IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add method that makes sure that URL's are expanded for page navigation/

Browse Source
This commit is contained in:
James Cole 2018-02-16 14:51:59 +01:00
parent 22fdc81de2
commit d3294be1bc
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/Api/V1/Controllers/Controller.php
View File

@ -61,6 +61,32 @@ class Controller extends BaseController
$this->parameters = $this->getParameters();
}
/**
* @return string
*/
protected function buildParams(): string
{
$return = '?';
$params = [];
foreach ($this->parameters as $key => $value) {
if($key === 'page') {
continue;
}
if ($value instanceof Carbon) {
$params[$key] = $value->format('Y-m-d');
}
if (!$value instanceof Carbon) {
$params[$key] = $value;
}
}
$return .= http_build_query($params);
if (strlen($return) === 1) {
return '';
}
return $return;
}
/**
* @return ParameterBag
*/
@ -74,13 +100,13 @@ class Controller extends BaseController
$bag->set('page', $page);
// some date fields:
$dates = ['start','end','date'];
foreach($dates as $field) {
$date = request()->get($field);
$obj = null;
$dates = ['start', 'end', 'date'];
foreach ($dates as $field) {
$date = request()->get($field);
$obj = null;
if (!is_null($date)) {
try {
$obj= new Carbon($date);
$obj = new Carbon($date);
} catch (InvalidDateException $e) {
// don't care
}