3 files changed, 22 insertions, 7 deletions
diff --git a/templates/web/default/report/banner.html b/templates/web/default/report/banner.html
index 85aaed82d..52bfa6e67 100644
--- a/templates/web/default/report/banner.html
+++ b/templates/web/default/report/banner.html
@@ -14,7 +14,7 @@
 [% IF problem.is_closed %]
     [% INCLUDE banner, id = 'closed', text = loc('This problem has been closed') %]
 [% END %]
-[% states = [ 'investigating', 'in progress', 'planned' ];
+[% states = [ 'investigating', 'in progress', 'planned', 'action scheduled' ];
    IF states.grep(problem.state).size %]
     [% INCLUDE banner, id = 'progress', text = loc('This problem is in progress') %]
 [% END %]
diff --git a/templates/web/default/report/update-form.html b/templates/web/default/report/update-form.html
index 7e39f79b7..d993ce28f 100644
--- a/templates/web/default/report/update-form.html
+++ b/templates/web/default/report/update-form.html
@@ -28,8 +28,10 @@
             <label for="form_state">[% loc( 'State:' ) %]</label>
             <select name="state" id="form_state">
             [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
-            loc('Investigating')], ['planned', loc('Planned')], ['in progress',
-            loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %]
+            loc('Investigating')], ['action scheduled', loc('Action Scheduled')],
+            ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')],
+            ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')],
+            ['fixed', loc('Fixed')] ] %]
                 <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option>
             [% END %]
             </select>
diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html
index eaf5209ff..736d36528 100644
--- a/templates/web/default/report/updates.html
+++ b/templates/web/default/report/updates.html
@@ -1,3 +1,4 @@
+[% global.last_state = '' %]
 [% FOREACH update IN updates %]
 [% INCLUDE 'report/update.html' %]
 [% END %]
@@ -22,8 +23,20 @@
     [%- ELSE %]
         [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html -%]
     [%- END -%]
-    [%- ", " _ loc( 'marked as fixed' ) IF update.mark_fixed %]
-    [%- ", " _ loc( 'reopened' ) IF update.mark_open OR update.problem_state == 'confirmed' %]
-    [%- ", " _ tprintf(loc( 'marked as %s' ), update.meta_problem_state) IF update.problem_state AND update.problem_state != 'confirmed' %]
+    [%- update_state = '' %]
+    [%- IF update.mark_fixed %][% update_state = ", " _ loc( 'marked as fixed' ) %][% END %]
+    [%- IF update.mark_open %][% update_state = ", " _ loc( 'reopened' ) %][% END %]
+    [%- IF !update_state && update.problem_state %]
+        [%- state = update.meta_problem_state %]
+        [%- IF c.cobrand.moniker == 'bromley' AND update.problem_state == 'unable to fix' %]
+            [%- state = loc('no further action') %]
+        [% END %]
+        [%- IF update.problem_state == 'confirmed' %]
+            [%- update_state = ", " _ loc('reopened') %]
+        [%- ELSE %]
+            [%- update_state = ", " _ tprintf(loc( 'marked as %s' ), state ) %]
+        [% END %]
+    [%- END %]
+    [%- update_state IF update_state != global.last_state %]
+    [%- global.last_state = update_state %]
 [% END %]
-