Alter form to deal with partial reports

1 files changed, 14 insertions, 5 deletions

diff --git a/templates/web/default/report/new/report_new.html b/templates/web/default/report/new/report_new.html
index 57a1d0a72..434da9c6b 100644
--- a/templates/web/default/report/new/report_new.html
+++ b/templates/web/default/report/new/report_new.html
@@ -1,5 +1,13 @@
 [% INCLUDE 'header.html', title => loc('Reporting a problem') %]
 
+[%
+    # NOTE ON PARTIAL REPORTS:
+    #
+    # partial reports get a bit of extra text added, the form goes to
+    # '/report/new' and the partial hidden field is added to the form.
+%]
+
+
 <h1>[% loc('Reporting a problem') %]</h1>
 
 [% IF location_error %]
@@ -16,24 +24,25 @@
 [% END %]
 
 [% IF partial_token %]
-
     <p style="margin-top: 0; color: #cc0000;">
         <img align="right" src="/photo?id=[% report.id %]" hspace="5">
         [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below&nbsp;:") %]
     </p>
-
-    <input type="hidden" name="partial" value="[% partial_token.token %]">
-    
 [% END %]
 
 [% IF pc_error %]
 <p class="error">[% pc_error %]</p>
 [% END %]
 
-<form action="/" method="get" name="postcodeForm" id="postcodeForm"><label for="pc">[% loc("Enter a nearby GB postcode, or street name and area") %]:</label>
+<form action="[% partial_token ? '/report/new' : '/' %]" method="get" name="postcodeForm" id="postcodeForm"><label for="pc">[% loc("Enter a nearby GB postcode, or street name and area") %]:</label>
 &nbsp;<input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200">
 &nbsp;<input type="submit" value="[% loc('Go') %]" id="submit">
 [% c.cobrand.form_elements %]
+
+[% IF partial_token %]
+    <input type="hidden" name="partial" value="[% partial_token.token %]">
+[% END %]
+
 </form>
 
 [% INCLUDE 'footer.html' %]