filters: Restrict ticket statuses to derivatives of open and closed

include/class.filter_action.php

@@ -437,7 +437,10 @@ class FA_SetStatus extends TriggerAction {
 
     function getConfigurationOptions() {
         $choices = array();
-        foreach (TicketStatusList::getStatuses() as $S) {
+        foreach (TicketStatusList::getStatuses(array(
+            'states' => array('open', 'closed')
+        ))
+        as $S) {
             // TODO: Move this to TicketStatus::getName
             $name = $S->getName();
             if (!($isenabled = $S->isEnabled()))

include/class.search.php

@@ -1129,11 +1129,22 @@ class TicketSourceChoiceField extends ChoiceField {
     }
 }
 
+class OpenClosedTicketStatusList extends TicketStatusList {
+    function getItems($criteria=array()) {
+        $rv = array();
+        $base = parent::getItems($criteria);
+        foreach ($base as $idx=>$S) {
+            if (in_array($S->state, array('open', 'closed')))
+                $rv[$idx] = $S;
+        }
+        return $rv;
+    }
+}
 class TicketStatusChoiceField extends SelectionField {
     static $widget = 'ChoicesWidget';
 
     function getList() {
-        return new TicketStatusList(
+        return new OpenClosedTicketStatusList(
             DynamicList::lookup(
                 array('type' => 'ticket-status'))
         );