From 7f2e31724baebc0ef6a727ca5bd009fa085e91b0 Mon Sep 17 00:00:00 2001 From: satish <satish.dvnk@vtiger.com> Date: Mon, 5 Jun 2017 19:00:55 +0530 Subject: [PATCH] Fixes #493 - vt7 change organization associated to opportunity from summaryview --- layouts/v7/modules/Vtiger/resources/Detail.js | 2 ++ layouts/v7/modules/Vtiger/resources/List.js | 2 +- layouts/v7/modules/Vtiger/resources/Vtiger.js | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/layouts/v7/modules/Vtiger/resources/Detail.js b/layouts/v7/modules/Vtiger/resources/Detail.js index b8dc71d68..f4dc16c66 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 6c9e2f6f2..fd38877a4 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 14c8deee0..8c61f1c60 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'); -- GitLab