[Vtigercrm-commits] [vtiger-commits] r7734 - in /vtigercrm/trunk: Popup.php Smarty/templates/Popup.tpl modules/Emails/Email.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Mon Jul  3 00:20:57 2006
New Revision: 7734

Log:
issue in Popup has been fixed

Modified:
    vtigercrm/trunk/Popup.php
    vtigercrm/trunk/Smarty/templates/Popup.tpl
    vtigercrm/trunk/modules/Emails/Email.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Mon Jul  3 00:20:57 2006
@@ -205,6 +205,11 @@
 }
 else
 {
+		if(isset($_REQUEST['recordid']) && $_REQUEST['recordid'] != '')
+		{		
+			$smarty->assign("RECORDID",$_REQUEST['recordid']);
+			$url_string .='&recordid='.$_REQUEST['recordid'];
+		}
         $where_relquery = getRelCheckquery($currentModule,$_REQUEST['return_module'],$_REQUEST['recordid']);
         $query = getListQuery($currentModule,$where_relquery);
 }
@@ -280,6 +285,8 @@
 $url_string .='&popuptype='.$popuptype;
 if(isset($_REQUEST['select']) && $_REQUEST['select'] == 'enable')
 	$url_string .='&select=enable';
+if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != '')
+	$url_string .='&return_module='.$_REQUEST['return_module'];
 $listview_header_search=getSearchListHeaderValues($focus,"$currentModule",$url_string,$sorder,$order_by);
 $smarty->assign("SEARCHLISTHEADER", $listview_header_search);
 

Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Mon Jul  3 00:20:57 2006
@@ -18,7 +18,6 @@
 <script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
 <script type="text/javascript">
 function add_data_to_relatedlist(entity_id,recordid,mod) {ldelim}
-
         opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module="+mod+"&entityid="+entity_id+"&parid="+recordid;
 {rdelim}
 
@@ -52,6 +51,7 @@
 					<input type="hidden" name="fldname_pb" value="{$FIELDNAME}">
 					<input type="hidden" name="productid_pb" value="{$PRODUCTID}">
 					<input name="popuptype" id="popup_type" type="hidden" value="{$POPUPTYPE}">
+					<input name="recordid" id="recordid" type="hidden" value="{$RECORDID}">
 
 				</td>
 				<td width="20%" class="dvtCellLabel">
@@ -139,6 +139,8 @@
 		urlstring +='&fldname='+getObj('fldname_pb').value;	
 	if(getObj('productid_pb').value != '')
 		urlstring +='&productid='+getObj('productid_pb').value;	
+	if(getObj('recordid').value != '')
+		urlstring +='&recordid='+getObj('recordid').value;	
 	return urlstring;
 {rdelim}
 																									

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Mon Jul  3 00:20:57 2006
@@ -91,7 +91,7 @@
 	*/
 	function get_contacts($id)
 	{
-		global $log;
+		global $log,$adb;
 		$log->debug("Entering get_contacts(".$id.") method ...");
 		global $mod_strings;
 		global $app_strings;
@@ -215,7 +215,7 @@
 	  */
 	function get_attachments($id)
 	{
-		global $log;
+		global $log,$adb;
 		$log->debug("Entering get_attachments(".$id.") method ...");
 		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,