kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 14:48:11 +00:00
Code Issues Projects Releases Wiki Activity

All kinds of new stuff. Started with perfecting the account controller. [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-07-26 18:53:41 +02:00
parent d088b2c558
commit b782bb8d93
75 changed files with 1075 additions and 8362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/lib/Firefly/Helper/Toolkit/Toolkit.php
View File

@@ -3,6 +3,7 @@
namespace Firefly\Helper\Toolkit;
use Carbon\Carbon;
use Illuminate\Http\Request;
/**
* Class Toolkit
@@ -13,15 +14,14 @@ class Toolkit implements ToolkitInterface
{
/**
* Based on the preference 'viewRange' and other variables I have not yet thought of,
* this method will return a date range that defines the 'current' period of time.
* @param Request $request
*
* ie. the current week or month.
*
* $start is always the past, $end is 'now' or at least later.
* @return \Illuminate\Http\RedirectResponse|mixed|null
*/
public function getDateRange()
public function getDateRange(Request $request)
{
$preferences = \App::make('Firefly\Helper\Preferences\PreferencesHelperInterface');
$viewRange = $preferences->get('viewRange', '1M');
@@ -146,7 +146,7 @@ class Toolkit implements ToolkitInterface
\Session::put('end', $end);
\Session::put('range', $range);
if ($doPrev || $doNext) {
return \Redirect::route('index');
return \Redirect::to($request->url());
}
return null;