From 91d0ac0a73d5380bec0ec5deb16815def400df85 Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Tue, 29 Nov 2016 14:53:01 +0100
Subject: [PATCH] =?UTF-8?q?Die=20Setting=20f=C3=BCr=20die=20Maps=20wird=20?=
=?UTF-8?q?nun=20auch=20korrekt=20von=20der=20Startseite=20zur=20Ergebniss?=
=?UTF-8?q?eite=20=C3=BCbertragen.=20Karten=20werden=20f=C3=BCr=20die=20Un?=
=?UTF-8?q?i=20Mainz=20nicht=20mehr=20angezeigt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/StartpageController.php | 7 +++++--
app/MetaGer.php | 1 +
resources/views/index.blade.php | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php
index c85cb7baa..3d019ab6c 100644
--- a/app/Http/Controllers/StartpageController.php
+++ b/app/Http/Controllers/StartpageController.php
@@ -28,7 +28,7 @@ class StartpageController extends Controller
$focusPages = [];
$theme = "default";
foreach ($request->all() as $key => $value) {
- if ($value === 'on' && $key != 'param_sprueche' && $key != 'param_tab') {
+ if ($value === 'on' && $key != 'param_sprueche' && $key != 'param_tab' && $key !== 'param_maps') {
$focusPages[] = str_replace('param_', '', $key);
}
if ($key === 'param_theme') {
@@ -36,6 +36,8 @@ class StartpageController extends Controller
}
}
+ $maps = $request->input('param_maps', 'on');
+
$agent = new Agent();
$browser = $agent->browser();
@@ -51,7 +53,8 @@ class StartpageController extends Controller
->with('focusPages', $focusPages)
->with('browser', $browser)
->with('navbarFocus', 'suche')
- ->with('theme', $theme);
+ ->with('theme', $theme)
+ ->with('maps', $maps);
}
public function loadPage($subpage)
diff --git a/app/MetaGer.php b/app/MetaGer.php
index 31ff71d1d..1afb4ed05 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -245,6 +245,7 @@ class MetaGer
$this->ads = [];
$this->products = [];
$this->validated = true;
+ $this->maps = false;
}
}
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 8249a5f3d..988376a29 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -188,6 +188,7 @@
<input type="hidden" name="time" value={{ $time }} >
<input type="hidden" name="sprueche" value={{ $sprueche }} >
<input type="hidden" name="tab" value={{ $tab }} >
+ <input type="hidden" name="maps" value={{ $maps }} >
@foreach ($focusPages as $fp)
<input type="hidden" name={{ $fp }} value="on">
@endforeach
--
GitLab