[Vtigercrm-commits] [vtiger-commits] r7783 - in /vtigercrm/trunk: include/utils/ListViewUtils.php modules/Notes/Delete.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Tue Jul  4 06:58:05 2006
New Revision: 7783

Log:
issue in notes delete from listview fixed. Fixes #1439

Modified:
    vtigercrm/trunk/include/utils/ListViewUtils.php
    vtigercrm/trunk/modules/Notes/Delete.php

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Tue Jul  4 06:58:05 2006
@@ -2737,6 +2737,7 @@
 function getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset)
 {
 	$current_module = $_REQUEST['module'];
+	$viewname = $_SESSION['lvs'][$current_module]['viewname'];
 
 	//This is added to avoid the del link in Product related list for the following modules
 	$avoid_del_links = Array("PurchaseOrder","SalesOrder","Quotes","Invoice");
@@ -2758,7 +2759,7 @@
 		$del_link .= "&return_module=$module&return_action=index";
 	}
 
-	$del_link .= "&parenttab=".$_REQUEST["parenttab"];
+	$del_link .= "&parenttab=".$_REQUEST["parenttab"]."&return_viewname=".$viewname;
 	
 	return $del_link;
 }

Modified: vtigercrm/trunk/modules/Notes/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Delete.php (original)
+++ vtigercrm/trunk/modules/Notes/Delete.php Tue Jul  4 06:58:05 2006
@@ -30,7 +30,6 @@
 DeleteEntity($_REQUEST['module'],$_REQUEST['return_module'],$focus,$_REQUEST['record'],$_REQUEST['return_id']);
 
 //code added for returning back to the current view after delete from list view
-if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 
 header("Location: index.php?module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&record=".$_REQUEST['return_id']."&viewname=".$return_viewname);