[Vtigercrm-commits] [vtiger-commits] r10996 - in /vtigercrm/branches/5.0.3: Smarty/templates/CustomView.tpl modules/CustomView/EditView.php modules/CustomView/language/en_us.lang.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed May 23 14:37:34 2007
New Revision: 10996

Log:
 fix for Costom view module.Leads --> Edit Custom view -->label name display is not proper, Fixes #3848 -sri

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl
    vtigercrm/branches/5.0.3/modules/CustomView/EditView.php
    vtigercrm/branches/5.0.3/modules/CustomView/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Wed May 23 14:37:34 2007
@@ -109,7 +109,13 @@
   <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
   <td class="showPanelBg" valign="top" width="100%">
    <div class="small" style="padding: 20px;">
-	<span class="lvtHeaderText"><a class="hdrLink" href="index.php?action=ListView&module={$MODULE}&parenttab={$CATEGORY}">{$APP.$MODULE}</a> &gt; {$MOD.New_Custom_View}</span> <br>
+	<span class="lvtHeaderText"><a class="hdrLink" href="index.php?action=ListView&module={$MODULE}&parenttab={$CATEGORY}">{$APP.$MODULE}</a> &gt;
+	{if $EXIST eq "true" && $EXIST neq ''}
+		{$MOD.Edit_Custom_View}
+	{else}
+	 	{$MOD.New_Custom_View}
+	{/if}
+	</span> <br>
       <hr noshade="noshade" size="1">
       <form name="EditView" method="post" enctype="multipart/form-data" action="index.php">
             <table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">

Modified: vtigercrm/branches/5.0.3/modules/CustomView/EditView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/EditView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/EditView.php Wed May 23 14:37:34 2007
@@ -107,7 +107,6 @@
 
 	$stdfilterlist = $oCustomView->getStdFilterByCvid($recordid);
 	$log->info('CustomView :: Successfully got Standard Filter for the Viewid'.$recordid);
-	$stdfilterlist["stdfilter"] = ($stdfilterlist["stdfilter"] != "") ? ($stdfilterlist["stdfilter"]) : ("custom");
 	$stdfilterhtml = $oCustomView->getStdFilterCriteria($stdfilterlist["stdfilter"]);
 	$stdfiltercolhtml = getStdFilterHTML($cv_module,$stdfilterlist["columnname"]);
 	$stdfilterjs = $oCustomView->getCriteriaJS();
@@ -150,7 +149,7 @@
 	$smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs);
 	$smarty->assign("MANDATORYCHECK",implode(",",array_unique($oCustomView->mandatoryvalues)));
 	$smarty->assign("SHOWVALUES",implode(",",$oCustomView->showvalues));
-
+	$smarty->assign("EXIST","true");
 	$cactionhtml = "<input name='customaction' class='button' type='button' value='Create Custom Action' onclick=goto_CustomAction('".$cv_module."');>";
 
 	if($cv_module == "Leads" || $cv_module == "Accounts" || $cv_module == "Contacts")

Modified: vtigercrm/branches/5.0.3/modules/CustomView/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/language/en_us.lang.php Wed May 23 14:37:34 2007
@@ -260,7 +260,8 @@
 'LBL_Select_a_Column'=>'Select a Column', 
 'Missing_required_fields'=>'Missing required fields', 
 'Details'=>'Details', 
-'New_Custom_View'=>'New Custom view', 
+'New_Custom_View'=>'New Custom view',
+'Edit_Custom_View'=>'Edit Custom View', 
 'LBL_AF_HDR5'=>'Simple Time Filter allows you to select date based on  
 <b>Account Created Time</b> or  <b>Account Modified Time</b>', 
 'Select_Duration'=>'Select Duration',