Merge branch 'migrate_to_catalyst' of ssh://git.mysociety.org/data/git/public/fixmystreet into migrate_to_catalyst

4 files changed, 0 insertions, 20 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index eef805da8..4aa37aa08 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -196,7 +196,6 @@ sub display_location : Private {
             clickable => 1,
             pins      => \@pins,
         );
-        $c->stash->{map_js} = FixMyStreet::Map::header_js();
     }
 
     return 1;
diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
index ba714a736..f6d7299b3 100755
--- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm
+++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
@@ -266,7 +266,6 @@ sub display : Private {
             colour    => $problem->state eq 'fixed' ? 'green' : 'red',
         } ],
     );
-    $c->stash->{map_js}                = FixMyStreet::Map::header_js();
     $c->stash->{cobrand_form_elements} = $c->cobrand->form_elements('questionnaireForm');
 }
 
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index b21f069c3..a36a13399 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -160,7 +160,6 @@ sub generate_map_tags : Private {
           } ]
         : [],
     );
-    $c->stash->{map_js} = FixMyStreet::Map::header_js();
 
     return 1;
 }
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index ba864eca4..e113517f9 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -77,9 +77,6 @@ all_pins: related to map display - not relevant to creation of a new report
 sub report_new : Path : Args(0) {
     my ( $self, $c ) = @_;
 
-    # set up the page
-    $c->forward('setup_page');
-
     # create the report - loading a partial if available
     $c->forward('initialize_report');
 
@@ -270,20 +267,6 @@ sub report_import : Path('/import') {
     return 1;
 }
 
-=head2 setup_page
-
-Setup the page - notably add the map js to the stash
-
-=cut
-
-sub setup_page : Private {
-    my ( $self, $c ) = @_;
-
-    $c->stash->{extra_js_verbatim} = FixMyStreet::Map::header_js();
-
-    return 1;
-}
-
 =head2 initialize_report
 
 Create the report and set up some basics in it. If there is a partial report