From 6f23d7b44ddc2556897e920cb88a3c81357605bf Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 7 Jul 2017 22:28:21 +0100
Subject: Allow static home page template override.

If an /about/homepage.html template exists in your cobrand, it
will be used as the front page, and the normal front page will
be available at /report.
---
 perllib/FixMyStreet/App.pm                     |  4 ++++
 perllib/FixMyStreet/App/Controller/Report.pm   | 13 +++++--------
 perllib/FixMyStreet/App/Controller/Root.pm     |  5 +++++
 t/app/controller/about.t                       | 24 ++++++++++++++++++++++++
 t/app/controller/report_display.t              |  5 -----
 t/app/controller/templates/about/homepage.html |  3 +++
 templates/web/base/main_nav_items.html         |  2 +-
 7 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 t/app/controller/templates/about/homepage.html

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 35e8c2537..5575d915e 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -200,6 +200,10 @@ sub setup_request {
 
     $c->stash->{site_name} = Utils::trim_text($c->render_fragment('site-name.html'));
 
+    if (my $template = $c->forward('/about/find_template', [ 'homepage' ])) {
+        $c->stash->{homepage_template} = $template;
+    }
+
     $c->model('DB::Problem')->set_restriction( $cobrand->site_key() );
 
     Memcached::set_namespace( FixMyStreet->config('FMS_DB_NAME') . ":" );
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 81abba3ac..040579e9f 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -28,14 +28,11 @@ Redirect to homepage unless C<id> parameter in query, in which case redirect to
 sub index : Path('') : Args(0) {
     my ( $self, $c ) = @_;
 
-    my $id = $c->get_param('id');
-
-    my $uri =
-        $id
-      ? $c->uri_for( '/report', $id )
-      : $c->uri_for('/');
-
-    $c->res->redirect($uri);
+    if ($c->stash->{homepage_template}) {
+        $c->stash->{template} = 'index.html';
+    } else {
+        $c->res->redirect('/');
+    }
 }
 
 =head2 report_display
diff --git a/perllib/FixMyStreet/App/Controller/Root.pm b/perllib/FixMyStreet/App/Controller/Root.pm
index 4f098dfc3..64d7fa6ae 100644
--- a/perllib/FixMyStreet/App/Controller/Root.pm
+++ b/perllib/FixMyStreet/App/Controller/Root.pm
@@ -58,6 +58,11 @@ sub index : Path : Args(0) {
         return;
     }
 
+    if ($c->stash->{homepage_template}) {
+        $c->stash->{template} = $c->stash->{homepage_template};
+        $c->detach;
+    }
+
     $c->forward('/auth/get_csrf_token');
 }
 
diff --git a/t/app/controller/about.t b/t/app/controller/about.t
index 8f3f25e27..04d902bc5 100644
--- a/t/app/controller/about.t
+++ b/t/app/controller/about.t
@@ -1,3 +1,9 @@
+package FixMyStreet::Cobrand::Tester;
+use parent 'FixMyStreet::Cobrand::Default';
+sub path_to_web_templates { [ FixMyStreet->path_to( 't', 'app', 'controller', 'templates') ] }
+
+package main;
+
 use FixMyStreet::TestMech;
 
 ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' );
@@ -25,4 +31,22 @@ FixMyStreet::override_config {
     $mech->content_contains('html class="no-js" lang="nb"');
 };
 
+$mech->get_ok('/');
+$mech->content_contains('Report a problem');
+$mech->content_lacks('STATIC FRONT PAGE');
+$mech->get('/report');
+is $mech->res->code, 200, "got 200";
+is $mech->res->previous->code, 302, "got 302 for redirect";
+is $mech->uri->path, '/', 'redirected to front page';
+
+FixMyStreet::override_config {
+    ALLOWED_COBRANDS => [ 'tester' ],
+}, sub {
+    $mech->get_ok('/');
+    $mech->content_contains('STATIC FRONT PAGE');
+    $mech->get_ok('/report');
+    is $mech->res->previous, undef, 'No redirect';
+    $mech->content_contains('Report a problem');
+};
+
 done_testing();
diff --git a/t/app/controller/report_display.t b/t/app/controller/report_display.t
index bcdf612be..093ea9cf8 100644
--- a/t/app/controller/report_display.t
+++ b/t/app/controller/report_display.t
@@ -35,11 +35,6 @@ subtest "check that no id redirects to homepage" => sub {
     is $mech->uri->path, '/', "at home page";
 };
 
-subtest "test id=NNN redirects to /NNN" => sub {
-    $mech->get_ok("/report?id=$report_id");
-    is $mech->uri->path, "/report/$report_id", "at /report/$report_id";
-};
-
 subtest "test bad council email clients web links" => sub {
     $mech->get_ok("/report/3D$report_id");
     is $mech->uri->path, "/report/$report_id", "at /report/$report_id";
diff --git a/t/app/controller/templates/about/homepage.html b/t/app/controller/templates/about/homepage.html
new file mode 100644
index 000000000..c8d5c1eb3
--- /dev/null
+++ b/t/app/controller/templates/about/homepage.html
@@ -0,0 +1,3 @@
+<p>
+    THIS IS A STATIC FRONT PAGE.
+</p>
diff --git a/templates/web/base/main_nav_items.html b/templates/web/base/main_nav_items.html
index 6b5e09e56..845ef7c65 100644
--- a/templates/web/base/main_nav_items.html
+++ b/templates/web/base/main_nav_items.html
@@ -1,4 +1,4 @@
-[%~ INCLUDE navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
+[%~ INCLUDE navitem uri=(homepage_template ? '/report' : '/') label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
 
 [%~ IF c.user_exists ~%]
     [%~ INCLUDE navitem uri='/my' label=loc('Your account') ~%]
-- 
cgit v1.2.3