Added version and type filters to the ticket filters interface.

lommes · Sep 9, 2012 · e1a2870 · e1a2870
1 parent d6ce140
commit e1a2870
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/system/controllers/tickets_controller.php b/system/controllers/tickets_controller.php
@@ -74,13 +74,13 @@ public function action_index()
 				$value = substr($value, 1);
 			}
 
-			// Milestone filter
-			if ($filter == 'milestone') {
+			// Milestone and Version filter
+			if ($filter == 'milestone' or $filter == 'version') {
 				foreach (explode(',', $value) as $name) {
 					$milestone = Milestone::find('slug', $name);
 					$filter_sql[] = $milestone->id;
 				}
-				$sql[] = "milestone_id " . ($prefix == '!' ? 'NOT' :'') . " IN (" . implode(', ', $filter_sql) . ")";
+				$sql[] = "{$filter}_id " . ($prefix == '!' ? 'NOT' :'') . " IN (" . implode(', ', $filter_sql) . ")";
 			}
 			// Status filter
 			elseif ($filter == 'status') {

diff --git a/system/views/default/tickets/_filters.php b/system/views/default/tickets/_filters.php
@@ -16,7 +16,7 @@
 					) :''; ?>
 				</td>
 				<td>
-					<?php if (in_array($filter, array('milestone', 'status'))) {
+					<?php if (in_array($filter, array('milestone', 'status', 'version', 'type'))) {
 						echo Form::select("filters[{$filter}][values][]",
 							ticket_filter_options_for($filter),
 							array('value' => $value)