[Vtigercrm-commits] [vtiger-commits] r7605 - in /vtigercrm/trunk: include/utils/ListViewUtils.php modules/Activities/Save.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed Jun 28 03:28:25 2006
New Revision: 7605

Log:
Issue in Emails list view has been fixed

Modified:
    vtigercrm/trunk/include/utils/ListViewUtils.php
    vtigercrm/trunk/modules/Activities/Save.php

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Wed Jun 28 03:28:25 2006
@@ -345,7 +345,7 @@
 	$log->debug("Entering getNavigationValues(".$display.",".$noofrows.",".$limit.") method ...");
 	$navigation_array = Array();   
 	global $limitpage_navigation;
-/*	if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All'){
+	if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All'){
 		$navigation_array['start'] =1;
 		$navigation_array['first'] = 1;
 		$navigation_array['end'] = 1;
@@ -357,7 +357,7 @@
 		$navigation_array['verylast'] =1;
 		$log->debug("Exiting getNavigationValues method ...");
 		return $navigation_array;
-	}*/
+	}
 	if($noofrows != 0)
 	$start = ((($display * $limit) - $limit)+1);
 	else
@@ -633,7 +633,7 @@
 								if(isPermitted("Activities",'EditView',$activityid) == 'yes')
 								{
 									// Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2
-									$value = "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&return_viewname=".$oCv->setdefaultviewid."&action=Save&module=Activities&record=".$activityid."&change_status=true".$evt_status."&start=".$navigation_array['current']."&allflag=".$navigation_array['allflag']."' style='".$P_FONT_COLOR."'>X</a>"; // Armando Lüscher 05.07.2005 -> §priority -> Desc: inserted style="$P_FONT_COLOR"
+									$value = "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&return_viewname=".$oCv->setdefaultviewid."&action=Save&module=Activities&record=".$activityid."&change_status=true".$evt_status."&start=".$navigation_array['current']."' style='".$P_FONT_COLOR."'>X</a>"; // Armando Lüscher 05.07.2005 -> §priority -> Desc: inserted style="$P_FONT_COLOR"
 								}
 								else
 								{

Modified: vtigercrm/trunk/modules/Activities/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Save.php (original)
+++ vtigercrm/trunk/modules/Activities/Save.php Wed Jun 28 03:28:25 2006
@@ -157,10 +157,6 @@
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 if($_REQUEST['start'] !='')$page='&start='.$_REQUEST['start'];
-if($_REQUEST['allflag'] !='All')
-	$page.='&allflag=All';	
-else
-	$page.='&allflag=Normal';
 header("Location: index.php?action=$return_action&module=$return_module$view$hour$day$month$year&record=$return_id$activemode&viewname=$return_viewname$page");
 
 //Function to get the vtiger_activity details for mail body