diff --git a/layouts/v7/modules/Vtiger/resources/Detail.js b/layouts/v7/modules/Vtiger/resources/Detail.js index b8dc71d68a8c4d4191f9cab33cc493d3cfb477de..f4dc16c66a72e6ce12a14298103bbbd9ff41d26d 100644 --- a/layouts/v7/modules/Vtiger/resources/Detail.js +++ b/layouts/v7/modules/Vtiger/resources/Detail.js @@ -1478,6 +1478,7 @@ Vtiger.Class("Vtiger_Detail_Js",{ if(typeof contentHolder === 'undefined') { contentHolder = this.getContentHolder(); } + contentHolder.off('click', 'clearReferenceSelection'); contentHolder.on('click','.clearReferenceSelection',function(e){ e.preventDefault(); var element = jQuery(e.currentTarget); @@ -1486,6 +1487,7 @@ Vtiger.Class("Vtiger_Detail_Js",{ parentTdElement.find('.referencefield-wrapper').removeClass('selected'); inputElement.removeAttr("disabled"); inputElement.attr("value",""); + inputElement.data('value',''); inputElement.val(""); element.addClass('hide'); }); diff --git a/layouts/v7/modules/Vtiger/resources/List.js b/layouts/v7/modules/Vtiger/resources/List.js index 6c9e2f6f2489351e50b87c63c17d121da3516ad6..fd38877a4fd18ff880b853ff2f587b98ded0ac39 100644 --- a/layouts/v7/modules/Vtiger/resources/List.js +++ b/layouts/v7/modules/Vtiger/resources/List.js @@ -970,7 +970,7 @@ Vtiger.Class("Vtiger_List_Js", { if (jQuery.inArray(fieldType, picklistTypes) !== -1) { value = jQuery(".inputElement.select2", fieldElement).find(":selected").val(); } else if (fieldType === "reference") { - value = inputElement.attr("value"); + value = inputElement.data('value'); } else if (fieldType === "multipicklist") { var selectedOptions = jQuery(".inputElement.select2", fieldElement).find(":selected"); value = []; diff --git a/layouts/v7/modules/Vtiger/resources/Vtiger.js b/layouts/v7/modules/Vtiger/resources/Vtiger.js index 14c8deee07e537eaf8f6a975b041ab2e04cb8969..8c61f1c603c98654c2bfcffc29cf122c9721e60c 100644 --- a/layouts/v7/modules/Vtiger/resources/Vtiger.js +++ b/layouts/v7/modules/Vtiger/resources/Vtiger.js @@ -846,7 +846,8 @@ Vtiger.Class('Vtiger_Index_Js', { * @param <jQUery> container */ registerClearReferenceSelectionEvent : function(container) { - container.find('.clearReferenceSelection').on('click', function(e){ + container.off('click', 'clearReferenceSelection'); + container.on('click', 'clearReferenceSelection',function(e){ e.preventDefault(); var element = jQuery(e.currentTarget); var parentTdElement = element.closest('td'); @@ -859,6 +860,7 @@ Vtiger.Class('Vtiger_Index_Js', { parentTdElement.find('.referencefield-wrapper').removeClass('selected'); inputElement.removeAttr("disabled").removeAttr('readonly'); inputElement.attr("value",""); + inputElement.data('value',''); inputElement.val(""); parentTdElement.find('input[name="'+fieldName+'"]').val(""); element.addClass('hide'); @@ -1147,9 +1149,11 @@ Vtiger.Class('Vtiger_Index_Js', { if (id && selectedName) { if(!fieldDisplayElement.length) { fieldElement.attr('value',id); + fieldElement.data('value', id); fieldElement.val(selectedName); } else { fieldElement.val(id); + fieldElement.data('value', id); fieldDisplayElement.val(selectedName); if(selectedName) { fieldDisplayElement.attr('readonly', 'readonly');