diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2013-02-21 12:31:17 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2013-02-21 12:31:17 +0000 |
| commit | e2bf144a6aaa19779fc55a04081a3c269b9d0f81 (patch) | |
| tree | 00318d801d35948938743608252fccd2d1b4e585 /perllib/FixMyStreet/App/Controller/Auth.pm | |
| parent | eb0c0d42f3596c5dc21e9bcdcc02a4008a541c34 (diff) | |
| parent | f8a8948ddb790e7e7593d538c55a3a278fbf3973 (diff) | |
Merge remote branch 'origin/zurich'
(locale ignored, will rerun .po extraction after to get all changes.)
Conflicts:
locale/FixMyStreet.po
locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
templates/web/fixmystreet/report/banner.html
templates/web/zurich/faq/faq-de-ch.html
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Auth.pm')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Auth.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm index f4d6d86e4..57b53a155 100644 --- a/perllib/FixMyStreet/App/Controller/Auth.pm +++ b/perllib/FixMyStreet/App/Controller/Auth.pm @@ -31,7 +31,7 @@ sub general : Path : Args(0) { my $req = $c->req; $c->detach( 'redirect_on_signin', [ $req->param('r') ] ) - if $c->user && $req->param('r') && $req->param('r') !~ /admin/; + if $c->user && $req->param('r'); # all done unless we have a form posted to us return unless $req->method eq 'POST'; @@ -182,6 +182,10 @@ Used after signing in to take the person back to where they were. sub redirect_on_signin : Private { my ( $self, $c, $redirect ) = @_; $redirect = 'my' unless $redirect; + if ( $c->cobrand->moniker eq 'zurich' ) { + $redirect = 'my' if $redirect eq 'admin'; + $redirect = 'admin' if $c->user->from_body; + } $c->res->redirect( $c->uri_for( "/$redirect" ) ); } |