diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-07-11 17:20:55 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-07-11 17:20:55 +0100 |
| commit | 83be54e6b5b465217ec1cddef31f220915f5ed0f (patch) | |
| tree | 6ebf3342d5f4ae8a5870f65040ca6e6b337bec14 | |
| parent | 15fb383ca0877f9a5e648e20e85745625cc0ea07 (diff) | |
reworking mm_msg_id, instead of service
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 9 | ||||
| -rw-r--r-- | templates/web/fixmybarangay/header.html | 26 |
2 files changed, 18 insertions, 17 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 3d356cc40..882fa30be 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -801,6 +801,9 @@ sub process_report : Private { # set these straight from the params $report->category( _ $params{category} ) if $params{category}; + # if there is a Message Manager message ID, save it + $report->mm_msg_id( $params{mm_msg_id} ) if $params{mm_msg_id}=~/^\d+$/; + my $areas = $c->stash->{all_areas}; $report->areas( ',' . join( ',', sort keys %$areas ) . ',' ); @@ -1001,11 +1004,6 @@ sub save_user_and_report : Private { # Set unknown to DB unknown $report->council( undef ) if $report->council eq '-1'; - # if there is a Message Manager message ID, pass it back to the client view - if ($c->req->param('mm_msg_id')) { - $report->service( $c->req->param('mm_msg_id') ); - } - # save the report; $report->in_storage ? $report->update : $report->insert(); @@ -1070,6 +1068,7 @@ sub redirect_or_confirm_creation : Private { $c->forward( 'create_reporter_alert' ); my $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); $c->detach; } diff --git a/templates/web/fixmybarangay/header.html b/templates/web/fixmybarangay/header.html index 55cf47789..e60e46ab2 100644 --- a/templates/web/fixmybarangay/header.html +++ b/templates/web/fixmybarangay/header.html @@ -23,20 +23,22 @@ [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> - <script src="[% version('/cobrands/fixmybarangay/message_manager_client.js') %]" charset="utf-8"></script> [% allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_council); %] - [%IF allow_creation && problem.service %] - <script> - $(document).ready(function() { - var mm_msg_id ="[% problem.service %]".match(/\d+$/); - var fms_id = "[% problem.id %]"; - if (mm_msg_id && fms_id) { - message_manager.config({url_root: "[% c.config.MESSAGE_MANAGER_URL %]"}); - message_manager.assign_fms_id(mm_msg_id, fms_id); - } - }); - </script> + [% IF allow_creation %] + <script src="[% version('/cobrands/fixmybarangay/message_manager_client.js') %]" charset="utf-8"></script> + [% IF c.req.params.mm_msg_id && problem && problem.mm_msg_id.match('^\d+$') %] + <script> + $(document).ready(function() { + var mm_msg_id ="[% c.req.params.mm_msg_id %]"; + var fms_id = "[% problem.id %]"; + if (mm_msg_id && fms_id) { + message_manager.config({url_root: "[% c.config.MESSAGE_MANAGER_URL %]"}); + message_manager.assign_fms_id(mm_msg_id, fms_id); + } + }); + </script> + [% END %] [% END %] </head> <body class="[% bodyclass | html IF bodyclass %]"> |