Add update URL model method.

6 files changed, 12 insertions, 7 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Contact.pm b/perllib/FixMyStreet/App/Controller/Contact.pm
index b98bdbcc7..5a077d8c3 100644
--- a/perllib/FixMyStreet/App/Controller/Contact.pm
+++ b/perllib/FixMyStreet/App/Controller/Contact.pm
@@ -168,8 +168,7 @@ sub prepare_params_for_email : Private {
 
     if ( $c->stash->{update} ) {
 
-        $c->stash->{problem_url} = $base_url . '/report/' . $c->stash->{update}->problem_id
-            . '#update_' . $c->stash->{update}->id;
+        $c->stash->{problem_url} = $base_url . $c->stash->{update}->url;
         $c->stash->{admin_url} = $admin_url . '/update_edit/' . $c->stash->{update}->id;
         $c->stash->{complaint} = sprintf(
             "Complaint about update %d on report %d",
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index cf1ba444d..815c5cd81 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -149,6 +149,11 @@ sub confirm {
     $self->confirmed( \'current_timestamp' );
 }
 
+sub url {
+    my $self = shift;
+    return "/report/" . $self->problem_id . '#update_' . $self->id;
+}
+
 sub photos {
     my $self = shift;
     my $photoset = $self->get_photoset;
diff --git a/templates/email/default/other-updated.html b/templates/email/default/other-updated.html
index fbae37268..27eba9007 100644
--- a/templates/email/default/other-updated.html
+++ b/templates/email/default/other-updated.html
@@ -13,7 +13,7 @@ INCLUDE '_email_top.html';
   <h1 style="[% h1_style %]">Your update has been&nbsp;logged</h1>
   <p style="[% p_style %]">Your update has been logged on [% site_name %]:</p>
   <p style="margin: 20px auto; text-align: center">
-  <a style="[% button_style %]" href="[% cobrand.base_url_for_report(problem) %][% problem.url %]#update_[% update.id %]">View my update</a>
+  <a style="[% button_style %]" href="[% cobrand.base_url_for_report(problem) %][% update.url %]">View my update</a>
   </p>
   [% end_padded_box %]
 </th>
diff --git a/templates/email/default/other-updated.txt b/templates/email/default/other-updated.txt
index 4900f6c29..7e5631ef1 100644
--- a/templates/email/default/other-updated.txt
+++ b/templates/email/default/other-updated.txt
@@ -4,7 +4,7 @@ Hello [% update.name %],
 
 Your update has been logged on [% site_name %]:
 
-[% cobrand.base_url_for_report(problem) %][% problem.url %]#update_[% update.id %]
+[% cobrand.base_url_for_report(problem) %][% update.url %]
 
 Your update reads:
 
diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html
index a61a8ea44..1aaad6dc9 100644
--- a/templates/web/base/my/my.html
+++ b/templates/web/base/my/my.html
@@ -66,7 +66,7 @@
                 <p class="meta-2">
                     [% tprintf( loc("Added %s"), prettify_dt( u.confirmed, 'date' ) ) %]
                     &ndash;
-                    <a href="[% c.uri_for( '/report', u.problem_id ) %]#update_[% u.id %]">
+                    <a href="[% u.url %]">
                         [% u.problem.title | html %]
                     </a>
                 </p>
diff --git a/templates/web/base/tokens/confirm_update.html b/templates/web/base/tokens/confirm_update.html
index 01ac992ab..005a8a7ac 100644
--- a/templates/web/base/tokens/confirm_update.html
+++ b/templates/web/base/tokens/confirm_update.html
@@ -1,9 +1,10 @@
 [% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirmation');
 
 DEFAULT problem = update.problem;
-SET problem_url = c.uri_for('/report', problem.id);
 IF update;
-    problem_url = problem_url _ '#update_' _ update.id;
+    SET problem_url = update.url;
+ELSE;
+    SET problem_url = problem.url;
 END;
 
 %]