[Vtigercrm-commits] [vtiger-commits] r10978 - in /vtigercrm/branches/5.0.3/modules/CustomView: CustomView.php EditView.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed May 23 04:22:14 2007
New Revision: 10978

Log:
fix for issue in default populated customview. --minnie

Modified:
    vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php
    vtigercrm/branches/5.0.3/modules/CustomView/EditView.php

Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Wed May 23 04:22:14 2007
@@ -714,13 +714,13 @@
 		$stdfilterlist["columnname"] = $stdfilterrow["columnname"];
 		$stdfilterlist["stdfilter"] = $stdfilterrow["stdfilter"];
 
-		if($stdfilterrow["stdfilter"] == "custom")
-		{
-			if($stdfilterrow["startdate"] != "0000-00-00")
+		if($stdfilterrow["stdfilter"] == "custom" || $stdfilterrow["stdfilter"] == "")
+		{
+			if($stdfilterrow["startdate"] != "0000-00-00" && $stdfilterrow["startdate"] != "")
 			{
 				$stdfilterlist["startdate"] = $stdfilterrow["startdate"];
 			}
-			if($stdfilterrow["enddate"] != "0000-00-00")
+			if($stdfilterrow["enddate"] != "0000-00-00" && $stdfilterrow["enddate"] != "")
 			{
 				$stdfilterlist["enddate"] = $stdfilterrow["enddate"];
 			}

Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Wed May 23 04:22:14 2007
@@ -107,6 +107,7 @@
 
 	$stdfilterlist = $oCustomView->getStdFilterByCvid($recordid);
 	$log->info('CustomView :: Successfully got Standard Filter for the Viewid'.$recordid);
+	$stdfilterlist["stdfilter"] = ($stdfilterlist["stdfilter"] != "") ? ($stdfilterlist["stdfilter"]) : ("custom");
 	$stdfilterhtml = $oCustomView->getStdFilterCriteria($stdfilterlist["stdfilter"]);
 	$stdfiltercolhtml = getStdFilterHTML($cv_module,$stdfilterlist["columnname"]);
 	$stdfilterjs = $oCustomView->getCriteriaJS();