[Vtigercrm-commits] [vtiger-commits] r6547 - in /vtigercrm/trunk: include/utils/SearchUtils.php modules/Activities/ListView.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Sat May 27 12:31:07 2006
New Revision: 6547

Log:
Advance search issue fixed

Modified:
    vtigercrm/trunk/include/utils/SearchUtils.php
    vtigercrm/trunk/modules/Activities/ListView.php

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Sat May 27 12:31:07 2006
@@ -255,7 +255,6 @@
 	global $column_array,$table_col_array;
 	for($i=0; $i<count($column_array);$i++)
 	{
-		
 		if($column_name == $column_array[$i])
 		{
 			$val=$table_col_array[$i];
@@ -503,6 +502,11 @@
 				$adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'activity.status')." or";	
 				$adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'activity.eventstatus')." )".$matchtype;	
 			}
+			elseif($tab_col == "cntactivityrel.contactid")
+			{
+				$adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'contactdetails.firstname')." or";	
+				$adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'contactdetails.lastname')." )".$matchtype;	
+			}
 			elseif(in_array($column_name,$column_array))
                         {
                                 $adv_string .= getValuesforColumns($column_name,$srch_val)." ".$matchtype;

Modified: vtigercrm/trunk/modules/Activities/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/ListView.php (original)
+++ vtigercrm/trunk/modules/Activities/ListView.php Sat May 27 12:31:07 2006
@@ -121,6 +121,8 @@
 	$list_query .= " AND " .$where;
 }
 
+$list_query .= ' group by activity.activityid';
+
 if(isset($order_by) && $order_by != '')
 {
 	$tablename = getTableNameForField('Activities',$order_by);