Index: branches/5.2.x/core/units/helpers/search_helper.php
===================================================================
diff -u -N -r14699 -r14718
--- branches/5.2.x/core/units/helpers/search_helper.php	(.../search_helper.php)	(revision 14699)
+++ branches/5.2.x/core/units/helpers/search_helper.php	(.../search_helper.php)	(revision 14718)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: search_helper.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: search_helper.php 14718 2011-11-01 10:40:06Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -539,39 +539,33 @@
 					$from = $this->getRangeValue($field_options['submit_value']['from']);
 					$to = $this->getRangeValue($field_options['submit_value']['to']);
 
-					if ($from !== false && $to !== false) {
+					if ( $from !== false && $to !== false ) {
 						// add range filter
-						$filter_value = $table_name.'`'.$field_name.'` >= '.$from.' AND '.$table_name.'`'.$field_name.'` <= '.$to;
+						$filter_value = $table_name . '`' . $field_name . '` >= ' . $from . ' AND ' . $table_name . '`' . $field_name . '` <= ' . $to;
 					}
-					elseif ($from !== false) {
-						// add equals filter on $from
-						$filter_value = $table_name.'`'.$field_name.'` = '.$from;
+					elseif ( $field_type == 'int' || $field_type == 'integer' ) {
+						if ( $from !== false ) {
+							// add equals filter on $from
+							$filter_value = $table_name . '`' . $field_name . '` = ' . $from;
+						}
+						elseif ( $to !== false ) {
+							// add equals filter on $to
+							$filter_value = $table_name . '`' . $field_name . '` = ' . $to;
+						}
 					}
-					elseif ($to !== false) {
-						// add equals filter on $to
-						$filter_value = $table_name.'`'.$field_name.'` = '.$to;
+					else {
+						// MySQL can't compare values in "float" type columns using "=" operator
+						if ( $from !== false ) {
+							// add equals filter on $from
+							$filter_value = 'ABS(' . $table_name . '`' . $field_name . '` - ' . $from . ') <= 0.0001';
+						}
+						elseif ( $to !== false ) {
+							// add equals filter on $to
+							$filter_value = 'ABS(' . $table_name . '`' . $field_name . '` - ' . $to . ') <= 0.0001';
+						}
 					}
 					break;
 
-				case 'float_range':
-					// MySQL can't compare values in "float" type columns using "=" operator
-					$from = $this->getRangeValue($field_options['submit_value']['from']);
-					$to = $this->getRangeValue($field_options['submit_value']['to']);
-
-					if ($from !== false && $to !== false) {
-						// add range filter
-						$filter_value = $table_name.'`'.$field_name.'` >= '.$from.' AND '.$table_name.'`'.$field_name.'` <= '.$to;
-					}
-					elseif ($from !== false) {
-						// add equals filter on $from
-						$filter_value = 'ABS('.$table_name.'`'.$field_name.'` - '.$from.') <= 0.0001';
-					}
-					elseif ($to !== false) {
-						// add equals filter on $to
-						$filter_value = 'ABS('.$table_name.'`'.$field_name.'` - '.$to.') <= 0.0001';
-					}
-					break;
-
 				case 'date_range':
 					$from = $this->processRangeField($object, $field_name, $field_options['submit_value'], 'from');
 					$to = $this->processRangeField($object, $field_name, $field_options['submit_value'], 'to');
Index: branches/5.2.x/core/units/agents/agents_config.php
===================================================================
diff -u -N -r14670 -r14718
--- branches/5.2.x/core/units/agents/agents_config.php	(.../agents_config.php)	(revision 14670)
+++ branches/5.2.x/core/units/agents/agents_config.php	(.../agents_config.php)	(revision 14718)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: agents_config.php 14670 2011-10-17 15:49:43Z alex $
+* @version	$Id: agents_config.php 14718 2011-11-01 10:40:06Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -160,7 +160,7 @@
 					'RunInterval' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ),
 					'RunMode' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ),
 					'LastRunOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
-					'RunTime' => Array ('filter_block' => 'grid_float_range_filter', 'width' => 145, ),
+					'RunTime' => Array ('filter_block' => 'grid_range_filter', 'width' => 145, ),
 					'LastRunStatus' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
 					'NextRunOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
 					'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 65, ),
Index: branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r14662 -r14718
--- branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 14662)
+++ branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 14718)
@@ -394,34 +394,6 @@
 		</table>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_float_range_filter" filter_width="90%">
-		<table class="range-filter">
-			<tr>
-				<td style="width: 100%">
-					<input type="text"
-						class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='float_range' type='from' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
-						name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>"
-						value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>"
-						style="width: <inp2:m_Param name="filter_width"/>"
-						onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
-				</td>
-				<td rowspan="2" valign="middle">
-					<img src="<inp2:m_TemplatesBase/>/img/expand_filter.gif" width="7" height="9" alt="" onclick="filter_toggle('<inp2:SearchInputName field='$filter_field' filter_type='range' type='to' grid='$grid'/>_row', '<inp2:m_Param name='PrefixSpecial'/>');"/>
-				</td>
-			</tr>
-			<tr class="to-range-filter<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> hidden-filter</inp2:m_ifnot>" id="<inp2:SearchInputName field='$filter_field' filter_type='float_range' type='to' grid='$grid'/>_row">
-				<td style="width: 100%;<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> display: none;</inp2:m_ifnot>">
-					<input type="text"
-						class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='float_range' type='to' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
-						name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>"
-						value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>"
-						style="width: <inp2:m_Param name="filter_width"/>"
-						onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
-				</td>
-			</tr>
-		</table>
-</inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="grid_date_range_filter" calendar_format="" filter_width="80%">
 		<table class="range-filter">
 			<tr>