[Vtigercrm-commits] [vtiger-commits] r5929 - /vtigercrm/trunk/modules/Activities/Activity.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Fri May 12 09:49:39 2006
New Revision: 5929

Log:
Issue of viewing the user info in Event Related list is Fixed. Fixes #688.

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Fri May 12 09:49:39 2006
@@ -195,6 +195,39 @@
 			$header[] = $app_strings['LBL_PHONE']; 
 
 
+
+			while($row = $adb->fetch_array($result))
+			{
+
+				global $current_user;
+
+				$entries = Array();	
+
+				if(is_admin($current_user))
+				{
+					$entries[] = '<a href="index.php?module=Users&action=DetailView&parenttab=Settings&return_module=Activities&return_action=DetailView&activity_mode=Events&record='.$row["id"].'&return_id='.$_REQUEST['record'].'">'.$row['last_name'].' '.$row['first_name'].'</a>';
+					$entries[] = '<a href="index.php?module=Users&action=DetailView&parenttab=Settings&return_module=Activities&return_action=DetailView&activity_mode=Events&record='.$row["id"].'&return_id='.$_REQUEST['record'].'">'.$row['user_name'].'</a>';
+				}
+				else
+				{
+					$entries[] = $row['last_name'].' '.$row['first_name'];
+					$entries[] = $row['user_name'];
+				}	
+
+
+				$entries[] = '<a href="mailto:'.$row["email1"].'"]">'.$row['email1'].'</a>';
+				if($email == '')	$email = $row['email2'];
+				if($email == '')	$email = $row['yahoo_id'];
+				$entries[] = $row['phone_home'];
+				if($phone == '')	$phone = $row['phone_work'];
+				if($phone == '')        $phone = $row['phone_other'];
+				if($phone == '')	$phone = $row['phone_fax'];
+
+				if(is_admin($current_user))
+				{		
+					$list .= '<a href="index.php?module=Users&action=EditView&return_module=Activities&return_action=DetailView&activity_mode=Events&record='.$row["id"].'&return_id='.$_REQUEST['record'].'">'.$app_strings['LNK_EDIT'].'</a>  | ';
+				}
+
 			// To display the dates for the Group calendar starts -Jaguar
 			$recur_dates_qry='select distinct(recurringdate) from recurringevents where activityid='.$activity_id;
 			$recur_result=$adb->query($recur_dates_qry);
@@ -206,39 +239,6 @@
 				$noofrows_recur = $adb->num_rows($recur_result);
 
 			}
-
-			while($row = $adb->fetch_array($result))
-			{
-
-				global $current_user;
-
-				$entries = Array();	
-
-				if(is_admin($current_user))
-				{
-					$entries[] = $row['last_name'].' '.$row['first_name'];
-				}
-				else
-				{
-					$entries[] = $row['last_name'].' '.$row['first_name'];
-				}	
-
-				$entries[] = $row['user_name'];
-
-				$entries[] = $row['email1'];
-				if($email == '')	$email = $row['email2'];
-				if($email == '')	$email = $row['yahoo_id'];
-				$entries[] = $row['phone_home'];
-				if($phone == '')	$phone = $row['phone_work'];
-				if($phone == '')        $phone = $row['phone_other'];
-				if($phone == '')	$phone = $row['phone_fax'];
-
-				if(is_admin($current_user))
-				{		
-					$list .= '<a href="index.php?module=Users&action=EditView&return_module=Activities&return_action=DetailView&activity_mode=Events&record='.$row["id"].'&return_id='.$_REQUEST['record'].'">'.$app_strings['LNK_EDIT'].'</a>  | ';
-				}
-
-
 				//Added for Group Calendar -Jaguar