diff --git a/layouts/v7/modules/Vtiger/resources/AdvanceSearch.js b/layouts/v7/modules/Vtiger/resources/AdvanceSearch.js index 3a229ac5bf2d45632e38bfa51ccc29b7751cfed6..0eda8c92168deb5c5072a762ad0dd98f31fd3a30 100644 --- a/layouts/v7/modules/Vtiger/resources/AdvanceSearch.js +++ b/layouts/v7/modules/Vtiger/resources/AdvanceSearch.js @@ -316,9 +316,8 @@ Vtiger_BasicSearch_Js("Vtiger_AdvanceSearch_Js",{ var thisInstance = this; this.formValidationDeferred = jQuery.Deferred(); thisInstance.formValidationDeferred.resolve(); - return this.formValidationDeferred.promise(); + var controlForm = this.getFilterForm(); - var validationDone = function(form, status){ if(status) { thisInstance.formValidationDeferred.resolve(); @@ -445,4 +444,4 @@ Vtiger_BasicSearch_Js("Vtiger_AdvanceSearch_Js",{ //To set the search module with the currently selected values. this.setSearchModule(jQuery('#searchModuleList').val()); } -}) \ No newline at end of file +}) diff --git a/layouts/v7/modules/Vtiger/resources/Popup.js b/layouts/v7/modules/Vtiger/resources/Popup.js index 477cff97bdeacf294bcefed4798cc6d9471a5ca8..d3bcfc25448ab8ff419491f2637d0dbf58c1a43d 100644 --- a/layouts/v7/modules/Vtiger/resources/Popup.js +++ b/layouts/v7/modules/Vtiger/resources/Popup.js @@ -332,10 +332,10 @@ jQuery.Class("Vtiger_Popup_Js",{ var aDeferred = jQuery.Deferred(); var completeParams = this.getCompleteParams(); completeParams['page'] = 1; - return this.getPageRecords(completeParams).then( + this.getPageRecords(completeParams).then( function(data){ aDeferred.resolve(data); - }); + }); return aDeferred.promise(); }, @@ -489,7 +489,7 @@ jQuery.Class("Vtiger_Popup_Js",{ } var completeParams = this.getCompleteParams(); jQuery.extend(completeParams,sortingParams); - return this.getPageRecords(completeParams).then( + this.getPageRecords(completeParams).then( function(data){ aDeferred.resolve(data); },