[Vtigercrm-commits] [vtiger-commits] r10987 - in /vtigercrm/branches/5.0.3: include/utils/ListViewUtils.php modules/Dashboard/Entity_charts.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed May 23 08:59:31 2007
New Revision: 10987

Log:
fix for dashboard issue. Fixes #3938 #3951 --minnie

Modified:
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
    vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Wed May 23 08:59:31 2007
@@ -2017,7 +2017,7 @@
 				ON vtiger_vendor.vendorid = vtiger_products.vendor_id
 			LEFT JOIN vtiger_users
 				ON vtiger_users.id = vtiger_products.handler";
-		if(isset($_REQUEST["from_homepagedb"]) && $_REQUEST["from_homepagedb"] == true)
+		if(isset($_REQUEST["from_dashboard"]) && $_REQUEST["from_dashboard"] == true)
                         $query .= " INNER JOIN vtiger_inventoryproductrel on vtiger_inventoryproductrel.productid = vtiger_products.productid";
                 $query .= " WHERE vtiger_crmentity.deleted = 0 ".$where;
 			break;
@@ -2090,7 +2090,7 @@
 				ON vtiger_users.id = vtiger_crmentity.smownerid
 			LEFT JOIN vtiger_customerdetails
 				ON vtiger_customerdetails.customerid = vtiger_contactdetails.contactid";
-		if(isset($_REQUEST["from_homepagedb"]) && $_REQUEST["from_homepagedb"] == true)
+		if(isset($_REQUEST["from_dashboard"]) && $_REQUEST["from_dashboard"] == true)
                         $query .= " INNER JOIN vtiger_campaigncontrel on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid";
                 $query .= " WHERE vtiger_crmentity.deleted = 0 ".$where;
 

Modified: vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php (original)
+++ vtigercrm/branches/5.0.3/modules/Dashboard/Entity_charts.php Wed May 23 08:59:31 2007
@@ -288,7 +288,7 @@
 					if($module == "Home")
 						$link_val="index.php?module=".$name."&action=ListView&from_homepagedb=true&type=dbrd&query=true&owner=".$current_user->user_name;
 					else if($module == "Contacts" || ($module=="Products" && ($graph_for == "quoteid" || $graph_for == "invoiceid" || $graph_for == "purchaseorderid")))
-						$link_val="index.php?module=".$module."&action=ListView&from_homepagedb=true&type=dbrd&query=true&".$graph_for."=".$id_name;
+						$link_val="index.php?module=".$module."&action=ListView&from_dashboard=true&type=dbrd&query=true&".$graph_for."=".$id_name;
 					else
 						$link_val="index.php?module=".$module."&action=index&from_dashboard=true&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar";