Fix help button.

This commit is contained in:
James Cole 2017-07-16 18:28:46 +02:00
parent 021d0e6359
commit 77d077ec08
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 6 additions and 5 deletions

View File

@ -68,6 +68,7 @@ class Controller extends BaseController
// get shown-intro-preference:
if (auth()->check()) {
$route = Route::currentRouteName();
$originalRoute = $route;
$route = str_replace('.', '_', $route);
$key = 'shown_demo_' . $route;
$config = config('intro.' . $route);
@ -78,6 +79,7 @@ class Controller extends BaseController
}
View::share('shownDemo', $shownDemo);
View::share('current_route_name', $route);
View::share('original_route_name', $originalRoute);
}
return $next($request);

View File

@ -11,6 +11,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json;
use Preferences;
use Response;
/**
@ -44,7 +45,6 @@ class IntroController
$currentStep['intro'] = trans('intro.' . $route . '_' . $key);
// save in array:
$steps[] = $currentStep;
}
@ -61,8 +61,7 @@ class IntroController
public function postFinished(string $route)
{
$key = 'shown_demo_' . $route;
// Preferences::set($key, true);
Preferences::set($key, true);
return Response::json(['result' => sprintf('Reported demo watched for route "%s".', $route)]);
}

View File

@ -62,8 +62,8 @@
<ul class="nav navbar-nav">
<li class="hidden-sm hidden-xs">
<a href="#" id="help" data-route="{{ current_route_name }}">
<i class="fa fa-question-circle" data-route="{{ current_route_name }}"></i>
<a href="#" id="help" data-route="{{ original_route_name }}">
<i class="fa fa-question-circle" data-route="{{ original_route_name }}"></i>
</a>
</li>