[Vtigercrm-commits] [vtiger-commits] r10012 - in /vtigercrm/branches/5.0.3: Smarty/templates/ListWordTemplates.tpl index.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed Jan  3 03:33:37 2007
New Revision: 10012

Log:
email template download issue - fixed

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl
    vtigercrm/branches/5.0.3/index.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl Wed Jan  3 03:33:37 2007
@@ -126,7 +126,7 @@
 						<td class="listTableRow small" valign=top><b>{$template.filename}</b></a></td>
 						<td class="listTableRow small" valign=top>{$template.description}&nbsp;</td>
 				        <td class="listTableRow small" valign=top>{$template.module}</td>
-				        <td class="listTableRow small" valign=top><a href="index.php?module=Settings&action=downloadfile&record={$template.templateid}">{$UMOD.LBL_DOWNLOAD}</a></td>
+				        <td class="listTableRow small" valign=top><a href="index.php?module=Settings&action=mailmergedownloadfile&record={$template.templateid}">{$UMOD.LBL_DOWNLOAD}</a></td>
 			          </tr>
 					{/foreach}
 					</table>

Modified: vtigercrm/branches/5.0.3/index.php
==============================================================================
--- vtigercrm/branches/5.0.3/index.php (original)
+++ vtigercrm/branches/5.0.3/index.php Wed Jan  3 03:33:37 2007
@@ -281,7 +281,8 @@
 		(ereg("^body",$action) && ereg("^Webmails",$module)) ||
 		(ereg("^dlAttachments",$action) && ereg("^Webmails",$module)) ||
 		(ereg("^DetailView",$action) &&	ereg("^Webmails",$module) ) ||
-		ereg("^savewordtemplate",$action))
+		ereg("^savewordtemplate",$action) ||
+		ereg("^mailmergedownloadfile",$action))
 	
 		
 	{
@@ -298,10 +299,11 @@
 			ereg("^".$module."Ajax",$action) ||
 			ereg("^chat",$action) ||
 			ereg("^vtchat",$action) ||
-			ereg("^massdelete", $action))
+			ereg("^massdelete", $action) ||
+			ereg("^mailmergedownloadfile",$action))
 			$skipFooters=true;
 		//skip footers for all these invocations as they are mostly popups
-		if(ereg("^downloadfile", $action) || ereg("^fieldtypes",$action))
+		if(ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^mailmergedownloadfile",$action))
 		{
 			$viewAttachment = true;
 		}