[Vtigercrm-commits] [vtiger-commits] r6083 - in /vtigercrm/trunk/modules: Accounts/ListView.php Leads/ListView.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: jeffk
Date: Tue May 16 12:38:53 2006
New Revision: 6083

Log:
refs #752. remerge [6075] through [6079] after [6082]

Modified:
    vtigercrm/trunk/modules/Accounts/ListView.php
    vtigercrm/trunk/modules/Leads/ListView.php

Modified: vtigercrm/trunk/modules/Accounts/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/ListView.php (original)
+++ vtigercrm/trunk/modules/Accounts/ListView.php Tue May 16 12:38:53 2006
@@ -45,6 +45,15 @@
 $smarty = new vtigerCRM_Smarty;
 $other_text = Array();
 
+if(!$_SESSION['lvs'][$currentModule])
+{
+	unset($_SESSION['lvs']);
+	$modObj = new ListViewSession();
+	$modObj->sorder = $sorder;
+	$modObj->sortby = $order_by;
+	$_SESSION['lvs'][$currentModule] = get_object_vars($modObj);
+}
+
 if($_REQUEST['errormsg'] != '')
 {
         $errormsg = $_REQUEST['errormsg'];
@@ -162,19 +171,14 @@
 //Retreiving the no of rows
 $noofrows = $adb->num_rows($list_result);
 
-//Retreiving the start value from request
-if(isset($_REQUEST['start']) && $_REQUEST['start'] != '')
-{
-        $start = $_REQUEST['start'];
-
-	//added to remain the navigation when sort
-	$url_string = "&start=".$_REQUEST['start'];
-}
-else
-{
-
-        $start = 1;
-}
+//Storing Listview session object
+if($_SESSION['lvs'][$currentModule])
+{
+	setSessionVar($_SESSION['lvs'][$currentModule],$noofrows,$list_max_entries_per_page);
+}
+
+$start = $_SESSION['lvs'][$currentModule]['start'];
+
 
 //Retreive the Navigation array
 $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);

Modified: vtigercrm/trunk/modules/Leads/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ListView.php (original)
+++ vtigercrm/trunk/modules/Leads/ListView.php Tue May 16 12:38:53 2006
@@ -50,6 +50,15 @@
 $smarty = new vtigerCRM_Smarty;
 $other_text=Array();
 
+if(!$_SESSION['lvs'][$currentModule])
+{
+	unset($_SESSION['lvs']);
+	$modObj = new ListViewSession();
+	$modObj->sorder = $sorder;
+	$modObj->sortby = $order_by;
+	$_SESSION['lvs'][$currentModule] = get_object_vars($modObj);
+}
+
 if($_REQUEST['errormsg'] != '')
 {
         $errormsg = $_REQUEST['errormsg'];
@@ -167,15 +176,7 @@
 $noofrows = $adb->num_rows($list_result);
 
 //Storing Listview session object
-if(!$_SESSION['lvs'][$currentModule])
-{
-	unset($_SESSION['lvs']);
-	$modObj = new ListViewSession();
-	$modObj->sorder = $sorder;
-	$modObj->sortby = $order_by;
-	$_SESSION['lvs'][$currentModule] = get_object_vars($modObj);
-}
-else
+if($_SESSION['lvs'][$currentModule])
 {
 	setSessionVar($_SESSION['lvs'][$currentModule],$noofrows,$list_max_entries_per_page);
 }