From 6ad797f8ec856894df4518817c9b86a41d57684e Mon Sep 17 00:00:00 2001 From: satish <satish.dvnk@vtiger.com> Date: Thu, 27 Apr 2017 11:54:21 +0530 Subject: [PATCH] Fixes #504 - Can't skip Duplicate Handling Step if no fields selected --- packages/vtiger/mandatory/Import.zip | Bin 78947 -> 78934 bytes .../v7/modules/Import/resources/Import.js | 24 ++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip index ac2e010996b323b7dfef1a5b9575caa888fa741e..725b080b6f095a129eb9508b7d16be5c3bdc3c7a 100644 GIT binary patch delta 6084 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 Ozs!vcrvjee_5T4o_-}y# delta 6085 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 NS_nUv1-Rey{{u5PXQcoD diff --git a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js index ce1a44c46..3eb57b9da 100644 --- a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js +++ b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js @@ -60,7 +60,7 @@ if (typeof (Vtiger_Import_Js) == 'undefined') { return false; }, uploadAndParse: function(auto_merge) { - if (Vtiger_Import_Js.validateFilePath() && Vtiger_Import_Js.validateMergeCriteria()) { + if (Vtiger_Import_Js.validateFilePath() && Vtiger_Import_Js.validateMergeCriteria(auto_merge)) { jQuery("#auto_merge").val(auto_merge); var form = jQuery("form[name='importBasic']"); var data = new FormData(form[0]); @@ -245,18 +245,16 @@ if (typeof (Vtiger_Import_Js) == 'undefined') { }); } }, - validateMergeCriteria: function() { - var selectedOptions = jQuery('#selected_merge_fields option'); - if (selectedOptions.length == 0) { - var errorMessage = app.vtranslate('JS_PLEASE_SELECT_ONE_FIELD_FOR_MERGE'); - var params = { - text: errorMessage, - 'type': 'error' - }; - Vtiger_Helper_Js.showMessage(params); - return false; - } - Vtiger_Import_Js.convertOptionsToJSONArray('#selected_merge_fields', '#merge_fields'); + validateMergeCriteria: function(auto_merge) { + if (auto_merge == 1) { + var selectedOptions = jQuery('#selected_merge_fields option'); + if (selectedOptions.length == 0) { + var errorMessage = app.vtranslate('JS_PLEASE_SELECT_ONE_FIELD_FOR_MERGE'); + app.helper.showErrorNotification({message: errorMessage}); + return false; + } + Vtiger_Import_Js.convertOptionsToJSONArray('#selected_merge_fields', '#merge_fields'); + } return true; }, //TODO move to a common file -- GitLab