[Vtigercrm-commits] [vtiger-commits] r10026 - in /vtigercrm/branches/5.0.3: Smarty/templates/CreateWordTemplate.tpl modules/Settings/savewordtemplate.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu Jan  4 06:05:26 2007
New Revision: 10026

Log:
Email template values retained when exception is thrown

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl
    vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateWordTemplate.tpl Thu Jan  4 06:05:26 2007
@@ -60,7 +60,7 @@
 					  </tr>
 					<tr>
 						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_DESCRIPTION}</strong></td>
-						<td class="cellText small" valign=top><textarea name="txtDescription" class=small style="width:90%;height:50px" value={$textDesc}></textarea></td>
+						<td class="cellText small" valign=top><textarea name="txtDescription" class=small style="width:90%;height:50px">{$smarty.request.description}</textarea></td>
 					  </tr>
 					<tr>
 						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_MODULENAMES}</strong></td>

Modified: vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php Thu Jan  4 06:05:26 2007
@@ -62,7 +62,9 @@
 	//    $fileid = create_guid();
 		$date_entered = date('YmdHis');
 		//Retreiving the return module and setting the parent type
+		
 		$ret_module = $_REQUEST['return_module'];
+		//$ret_module = $_REQUEST['target_module'];
 		$parent_type;		
 		if($_REQUEST['return_module'] == 'Leads')
 		{
@@ -76,9 +78,9 @@
 		{
 			$parent_type = 'Contact';
 		}
-		elseif($_REQUEST['return_module'] == 'Potentials')
+		elseif($_REQUEST['return_module'] == 'HelpDesk')
 		{
-			$parent_type = 'Potential';
+			$parent_type = 'HelpDesk';
 		}
 	 
 		$genQueryId = $adb->getUniqueID("vtiger_wordtemplates");
@@ -97,11 +99,12 @@
 			   deleteFile($uploaddir,$filename);
 			   	header("Location: index.php?action=listwordtemplates&module=Settings&parenttab=Settings");	
 			}
-		   	   elseif($savefile=="false")
-	                   {
-			   	header("Location: index.php?action=upload&module=Settings&parenttab=Settings&flag=".$error_flag);	
+		   	elseif($savefile=="false")
+	                {
+				$module = $_REQUEST['target_module'];
+			   	header("Location: index.php?action=upload&module=Settings&parenttab=Settings&flag=".$error_flag."&description=".$strDescription."&tempModule=".$module);	
 				   
-			   }  			   
+			}  			   
 			else
 			{
 				include('themes/'.$theme.'/header.php');