From 77d077ec08bb5872e6c514b6651961e74da5aab3 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 16 Jul 2017 18:28:46 +0200
Subject: [PATCH] Fix help button.

---
 app/Http/Controllers/Controller.php           | 2 ++
 app/Http/Controllers/Json/IntroController.php | 5 ++---
 resources/views/layout/default.twig           | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 73755b1a61..81170bb392 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -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);
diff --git a/app/Http/Controllers/Json/IntroController.php b/app/Http/Controllers/Json/IntroController.php
index e6f3104a31..0a68bb82b0 100644
--- a/app/Http/Controllers/Json/IntroController.php
+++ b/app/Http/Controllers/Json/IntroController.php
@@ -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)]);
     }
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index fd9ca3f626..2c22f78db5 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -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>