[Vtigercrm-commits] [vtiger-commits] r5198 - in /vtigercrm/trunk: include/utils/ListViewUtils.php modules/Emails/DetailView.php modules/Emails/EditView.php modules/Emails/Save.php modules/Emails/mailsend.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: don
Date: Thu Apr 20 13:24:26 2006
New Revision: 5198

Log:
code changed to integrate new UI for Emails

Modified:
    vtigercrm/trunk/include/utils/ListViewUtils.php
    vtigercrm/trunk/modules/Emails/DetailView.php
    vtigercrm/trunk/modules/Emails/EditView.php
    vtigercrm/trunk/modules/Emails/Save.php
    vtigercrm/trunk/modules/Emails/mailsend.php

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Thu Apr 20 13:24:26 2006
@@ -681,6 +681,7 @@
 
 	}
 	return $list_block;
+	
 }
 
 /**This function generates the List view entries in a popup list view 
@@ -1313,10 +1314,14 @@
 						
                                         $value = '<a href="index.php?action=DetailView&module=SalesOrder&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
 				}
-                                else
-                                {
-                                        $value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
-                                }
+				elseif($module == 'Emails')
+				{
+					$value = '<a href="javascript:getEmailContents(\''.$entity_id.'\')">'.$temp_val.'</a>';
+				}
+                else
+                {
+                   	$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
+                }
 			}
 		}
 		else

Modified: vtigercrm/trunk/modules/Emails/DetailView.php
==============================================================================
Binary files - no diff available.

Modified: vtigercrm/trunk/modules/Emails/EditView.php
==============================================================================
Binary files - no diff available.

Modified: vtigercrm/trunk/modules/Emails/Save.php
==============================================================================
Binary files - no diff available.

Modified: vtigercrm/trunk/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/mailsend.php Thu Apr 20 13:24:26 2006
@@ -159,8 +159,12 @@
 //The following function call is used to parse and form a encoded error message and then pass to result page
 $mail_error_str = getMailErrorString($mail_status_str);
 $adb->println("Mail Sending Process has been finished.\n\n");
-
-header("Location:index.php?module=$returnmodule&action=$returnaction&record=$returnid&$returnset&$mail_error_str");
+if(isset($_REQUEST['popupaction']) && $_REQUEST['popupaction'] != '')
+{
+	$inputs="<script>window.opener.location.href=window.opener.location.href;window.self.close();</script>";
+	echo $inputs;
+}
+//header("Location:index.php?module=$returnmodule&action=$returnaction&record=$returnid&$returnset&$mail_error_str");
 
 
 ?>