diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index ed1835d9c9..843c7bc8bd 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -61,6 +61,7 @@ class Controller extends BaseController View::share('IS_DEMO_SITE', $isDemoSite); View::share('DEMO_USERNAME', env('DEMO_USERNAME', '')); View::share('DEMO_PASSWORD', env('DEMO_PASSWORD', '')); + View::share('FF_VERSION', config('firefly.version')); $this->middleware( @@ -117,7 +118,7 @@ class Controller extends BaseController if (!(strpos($identifier, 'delete') === false) && !(strpos($uri, '/show/') === false)) { $uri = route('index'); } - if (!(strpos($uri, 'javascript') === false)) { + if (!(strpos($uri, 'jscript') === false)) { $uri = route('index'); } diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php deleted file mode 100644 index c419b0e8c3..0000000000 --- a/app/Http/Middleware/StartFireflySession.php +++ /dev/null @@ -1,54 +0,0 @@ -fullUrl(); - if ($request->method() === 'GET' && $request->route() && !$request->ajax()) { - if (strpos($fullUrl, '/javascript/') === false) { - $session->setPreviousUrl($fullUrl); - } - } - } - -} diff --git a/routes/web.php b/routes/web.php index f24ac03f48..1510bb8582 100755 --- a/routes/web.php +++ b/routes/web.php @@ -423,7 +423,7 @@ Route::group( * Budget Controller */ Route::group( - ['middleware' => 'user-full-auth', 'prefix' => 'javascript', 'as' => 'javascript.'], function () { + ['middleware' => 'user-full-auth', 'prefix' => 'jscript', 'as' => 'javascript.'], function () { Route::get('variables', ['uses' => 'JavascriptController@variables', 'as' => 'variables']); Route::get('accounts', ['uses' => 'JavascriptController@accounts', 'as' => 'accounts']); Route::get('currencies', ['uses' => 'JavascriptController@currencies', 'as' => 'currencies']);