Index: trunk/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r3373 -r3597
--- trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 3373)
+++ trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 3597)
@@ -672,6 +672,26 @@
 		return $o;
 	}
 
+	function PredefinedSearchOptions($params)
+	{
+		$object =& $this->getObject($params);
+		$field = $params['field'];
+		$saved_value = $object->GetDBField($field);
+		
+		$custom_filters = $this->Application->RecallVar( $this->getPrefixSpecial().'_custom_filters');
+		if ($custom_filters) {
+			$custom_filters = unserialize($custom_filters);
+			$append = getArrayValue($params, 'type') ? '_'.$params['type'] : '';
+			$object->SetDBField($field, $custom_filters[$field.$append]);
+		}
+		else {
+			$object->SetDBField($field, '');
+		}
+		$ret = $this->PredefinedOptions($params);
+		$object->SetDBField($field, $saved_value);
+		return $ret;
+	}
+	
 	function Format($params)
 	{
 		$field = $params['field'];
@@ -1332,7 +1352,9 @@
 	function SearchInputName($params)
 	{
 		$field = $this->SelectParam($params, 'field,name');
-		return 'custom_filters['.$this->getPrefixSpecial().']['.$field.'_'.$params['type'].']';
+		$append = getArrayValue($params, 'type') ? '_'.$params['type'] : '';
+		
+		return 'custom_filters['.$this->getPrefixSpecial().']['.$field.$append.']';
 	}
 
 	/**
Index: trunk/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r3559 -r3597
--- trunk/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 3559)
+++ trunk/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 3597)
@@ -1363,14 +1363,22 @@
 				{
 					case 'kOptionsFormatter':
 						$search_keys = Array();
-						$use_phrases = getArrayValue($object->Fields[$search_field], 'use_phrases');
-						foreach($object->Fields[$search_field]['options'] as $key => $val)
-						{
-							$pattern = '#'.$keyword.'#i';
-							if ( preg_match($pattern, $use_phrases ? $this->Application->Phrase($val) : $val) ) {
-								array_push($search_keys, $this->Conn->qstr($key));
+						
+						$field_value = getArrayValue($custom_filters, $search_field);
+						if ($field_value !== false) {
+							array_push($search_keys, $this->Conn->qstr($field_value));
+						}
+						else {
+							$use_phrases = getArrayValue($object->Fields[$search_field], 'use_phrases');
+							foreach($object->Fields[$search_field]['options'] as $key => $val)
+							{
+								$pattern = '#'.$keyword.'#i';
+								if ( preg_match($pattern, $use_phrases ? $this->Application->Phrase($val) : $val) ) {
+									array_push($search_keys, $this->Conn->qstr($key));
+								}
 							}
 						}
+						
 						if (count($search_keys) > 0) {
 							$filter_value = $table_name.'`'.$search_field.'` IN ('.implode(',', $search_keys).')';
 						}
Index: trunk/kernel/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r3559 -r3597
--- trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 3559)
+++ trunk/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 3597)
@@ -157,6 +157,18 @@
 	</td>
 <inp2:m_blockend />
 
+<inp2:m_DefineElement name="grid_column_filter">
+	<td>&nbsp;</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_options_filter">
+	<td>
+		<select name="<inp2:SearchInputName field="$field"/>">
+			<inp2:PredefinedSearchOptions field="$field" block="inp_option_item" selected="selected" has_empty="1" empty_value=""/>
+		</select>
+	</td>
+</inp2:m_DefineElement>
+
 <inp2:m_block name="viewmenu_sort_block"/>
 	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="$title"/>','direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:m_param name="sort_field"/>","<inp2:$PrefixSpecial_OrderInfo type="direction" pos="1"/>");','<inp2:m_if prefix="$PrefixSpecial" function="IsOrder" field="$sort_field" pos="1"/>2<inp2:m_endif/>');
 <inp2:m_blockend/>
@@ -224,7 +236,11 @@
 	</table>
 <inp2:m_blockend/>
 
-<inp2:m_block name="grid" main_prefix="" per_page="" main_special="" no_toolbar="" has_filters="" search=""/>
+<inp2:m_block name="grid" main_prefix="" per_page="" main_special="" no_toolbar="" has_filters="" grid_filters="" search="on" header_block="grid_column_title" filter_block="grid_column_filter" data_block="grid_data_td"/>
+<!-- 
+	grid_filters - show individual filters for each column
+	has_filters - draw filter section in "View" menu in toolbar
+-->
 	<inp2:$PrefixSpecial_SaveWarning name="grid_save_warning" main_prefix="$main_prefix" no_toolbar="$no_toolbar"/>
 	<inp2:m_if prefix="m" function="RecallEquals" var="{$PrefixSpecial}_search_keyword" value="" inverse="inverse"/>
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_<inp2:m_if prefix="m" function="ParamEquals" name="no_toolbar" value="no_toolbar"/>nobottom<inp2:m_else/>notop<inp2:m_endif/>">
@@ -235,10 +251,17 @@
   		</tr>
 	</table>
 	<inp2:m_endif/>
+	
 	<inp2:m_ParamEquals name="NoPagination" value="">
 		<inp2:m_ParseBlock name="grid_pagination" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" search="$search" no_toolbar="$no_toolbar"/>
 	</inp2>
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+		
+		<inp2:m_if check="m_ParamEquals" name="grid_filters" value="1">
+			<tr class="pagination_bar">
+				<inp2:$PrefixSpecial_IterateGridFields grid="$grid" mode="filter" block="$filter_block"/>
+			</tr>
+		</inp2:m_if>
 
 		<tr class="subsectiontitle">
 			<inp2:$PrefixSpecial_IterateGridFields grid="$grid" mode="header" block="$header_block"/>