diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-07-04 17:05:02 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-07-04 17:05:02 +0100 |
| commit | ca3d6ca903909c1f8ed31548d8a338e5cb6d71ba (patch) | |
| tree | 2830ba1b61b841d2af2fc041c73c43a5bd946918 /perllib/FixMyStreet/App/Controller/Root.pm | |
| parent | 91db7d51d0e2fe172e84ba4c00b4cf319e15c16d (diff) | |
| parent | 688169c4b0e12302efeab07478a59a28d45f3f98 (diff) | |
Merge branch 'fix-admin-proxy'
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Root.pm')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Root.pm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Root.pm b/perllib/FixMyStreet/App/Controller/Root.pm index 16f4aa491..88f480137 100644 --- a/perllib/FixMyStreet/App/Controller/Root.pm +++ b/perllib/FixMyStreet/App/Controller/Root.pm @@ -82,6 +82,13 @@ Display a 404 (not found) or 410 (gone) page. Pass in an optional error message sub page_error_404_not_found : Private { my ( $self, $c, $error_msg ) = @_; + + # Try getting static content that might be given under an admin proxy. + # First the special generated JavaScript file + $c->go('/js/translation_strings', [ $1 ], []) if $c->req->path =~ m{^admin/js/translation_strings\.(.*?)\.js$}; + # Then a generic static file + $c->serve_static_file("web/$1") && return if $c->req->path =~ m{^admin/(.*)}; + $c->stash->{template} = 'errors/page_error_404_not_found.html'; $c->stash->{error_msg} = $error_msg; $c->response->status(404); |