[Vtigercrm-commits] [vtiger-commits] r6320 - in /vtigercrm/trunk/modules/Settings: AddCustomFieldToDB.php CustomFieldList.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Tue May 23 03:35:30 2006
New Revision: 6320

Log:
Fixes #887

Modified:
    vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
    vtigercrm/trunk/modules/Settings/CustomFieldList.php

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Tue May 23 03:35:30 2006
@@ -56,7 +56,7 @@
 		$fldPickList='';
 	}
 	
-	header("Location:index.php?module=Settings&action=CreateCustomField&fld_module=".$fldmodule."&fldType=".$fldType."&fldlabel=".$fldlabel."&fldlength=".$fldlength."&flddecimal=".$flddecimal."&fldPickList=".$fldPickList."&parenttab=".$parenttab."&duplicate=yes");
+	header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fldmodule."&fldType=".$fldType."&fldlabel=".$fldlabel."&fldlength=".$fldlength."&flddecimal=".$flddecimal."&fldPickList=".$fldPickList."&parenttab=".$parenttab."&duplicate=yes");
 
 }
 else

Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CustomFieldList.php (original)
+++ vtigercrm/trunk/modules/Settings/CustomFieldList.php Tue May 23 03:35:30 2006
@@ -37,7 +37,12 @@
                         'Invoice'=>'Invoice',
 			'Campaigns'=>'Campaigns'
                         );
-	$smarty->assign("MODULES",$module_array);
+$smarty->assign("MODULES",$module_array);
+if(isset($_REQUEST["duplicate"]) && $_REQUEST["duplicate"] == "yes")
+{
+	$error='Custom Field in the Name '.$_REQUEST["fldlabel"].' already exists. Please specify a different Label';
+	$smarty->assign("DUPLICATE_ERROR", $error);
+}
 if($_REQUEST['ajax'] != 'true')
 	$smarty->display('CustomFieldList.tpl');	
 else