diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-07-11 17:29:06 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-07-11 17:29:06 +0100 |
| commit | 703b05dedb0c724fb079e07a5589d9803163fd4f (patch) | |
| tree | f7d63c2b286ad09240334488fd08817c5c3647b9 | |
| parent | 83be54e6b5b465217ec1cddef31f220915f5ed0f (diff) | |
| parent | 5fd90e4a82dcc5b2e7dd582dca2c1cd9c655c28c (diff) | |
Merge remote branch 'origin/fmb-read-only' into fmb-read-only
Conflicts:
perllib/FixMyStreet/App/Controller/Report/New.pm
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 8 | ||||
| -rw-r--r-- | templates/web/fixmybarangay/around/tabbed_lists.html | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 882fa30be..08d0addb9 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -1066,7 +1066,13 @@ sub redirect_or_confirm_creation : Private { if ( $report->confirmed ) { # Subscribe problem reporter to email updates $c->forward( 'create_reporter_alert' ); - my $report_uri = $c->uri_for( '/report', $report->id ); + my $report_uri; + + if ( $c->cobrand->moniker eq 'fixmybarangay' && $c->user->from_council && $c->stash->{mm_msg_id}) { + $report_uri = $c->uri_for( '/report', $report->id, undef, { mm_msg_id => $c->stash->{mm_msg_id} } ); + } else { + $report_uri = $c->uri_for( '/report', $report->id ); + } $c->log->info($report->user->id . ' was logged in, redirecting to /report/' . $report->id); XXXX $c->res->redirect($report_uri); diff --git a/templates/web/fixmybarangay/around/tabbed_lists.html b/templates/web/fixmybarangay/around/tabbed_lists.html index fa4bd6963..d73935a9c 100644 --- a/templates/web/fixmybarangay/around/tabbed_lists.html +++ b/templates/web/fixmybarangay/around/tabbed_lists.html @@ -56,7 +56,7 @@ $(document).ready(function() { if (data['success']) { // msg_text = $('#form_detail').val( $('input[name=mm_text]:checked').val() ); # == message data msg_text = data['data']['Message']['message']; - service_id = mm_url + "messages/view/" + data['data']['Message']['id']; + service_id = data['data']['Message']['id']; } else { $('input[name=mm_text]').prop('checked', false); // uncheck all } |