[Vtigercrm-commits] [vtiger-commits] r5447 - /vtigercrm/trunk/include/utils/SearchUtils.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Thu Apr 27 04:05:55 EDT 2006
Author: saraj
Date: Thu Apr 27 02:05:50 2006
New Revision: 5447
Log:
Searching an activity based on status - fixed. Fixes #622, and refs #622
Modified:
vtigercrm/trunk/include/utils/SearchUtils.php
Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Thu Apr 27 02:05:50 2006
@@ -302,6 +302,10 @@
{
$where = get_usersid($table_name,$column_name,$search_string);
}
+ elseif($table_name == "activity" && $column_name == "status")
+ {
+ $where="$table_name.$column_name like '%".$search_string."%' or activity.eventstatus like '%".$search_string."%'";
+ }
else if(in_array($column_name,$column_array))
{
$where = getValuesforColumns($column_name,$search_string);
@@ -435,6 +439,11 @@
$adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'users.user_name')." or";
$adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'groups.groupname')." )".$matchtype;
}
+ elseif($tab_col == "activity.status")
+ {
+ $adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'activity.status')." or";
+ $adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'activity.eventstatus')." )".$matchtype;
+ }
else
{
$adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,$tab_col)." ".$matchtype;
More information about the vtigercrm-commits
mailing list