[Vtigercrm-commits] [vtiger-commits] r6358 - in /vtigercrm/trunk: Smarty/templates/ImportStep2.tpl modules/Import/ImportStep3.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Wed May 24 08:03:34 2006
New Revision: 6358

Log:
* Modified to fix the validation issue in Import mapping

Modified:
    vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
    vtigercrm/trunk/modules/Import/ImportStep3.php

Modified: vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep2.tpl Wed May 24 08:03:34 2006
@@ -147,9 +147,9 @@
 				   </tr>
 				   <tr bgcolor="#ECECEC">
 					<td align="left" style="padding-left:40px;" >
-						<input type="checkbox" name="save_map" onclick="set_readonly(this.form)" />&nbsp;&nbsp;
+						<input type="checkbox" name="save_map" id="save_map" onclick="set_readonly(this.form)" />&nbsp;&nbsp;
 						{$MOD.LBL_SAVE_AS_CUSTOM} &nbsp;&nbsp;&nbsp;
-						<input type="text" readonly name="save_map_as" value="" class="importBox" >
+						<input type="text" readonly name="save_map_as" id="save_map_as" value="" class="importBox" >
 					</td>
 				   </tr>
 				   <tr bgcolor="#ECECEC"><td><hr /></td></tr>
@@ -157,7 +157,7 @@
 					<td align="right" style="padding-right:40px;" >
 						<input type="submit" name="button"  value=" &nbsp;&lsaquo; {$MOD.LBL_BACK} &nbsp; " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='2'; return true;" />
 						&nbsp;&nbsp;
-						<input type="submit" name="button"  value=" &nbsp; {$MOD.LBL_IMPORT_NOW} &rsaquo; &nbsp; " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='4'; return verify_data(Import)" />
+						<input type="submit" name="button"  value=" &nbsp; {$MOD.LBL_IMPORT_NOW} &rsaquo; &nbsp; " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='4'; return validate_import_map();" />
 					</td>
 				   </tr>
 				   <tr bgcolor="#ECECEC"><td align="right" >&nbsp;</td></tr>

Modified: vtigercrm/trunk/modules/Import/ImportStep3.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep3.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep3.php Wed May 24 08:03:34 2006
@@ -475,7 +475,7 @@
 			else
 			{
 				//if a field mapped more than once, alert the user and return
-				alert("'"+tagName.options[tagName.selectedIndex].text+"' has been mapped twice. Please check.");
+				alert("'"+tagName.options[tagName.selectedIndex].text+"' is mapped more than once. Please check the mapping.");
 				return false;
 			}
 		}