diff --git a/layouts/v7/modules/Vtiger/AdvanceSearch.tpl b/layouts/v7/modules/Vtiger/AdvanceSearch.tpl index 8404cce112ab2ce625977a7c8b67f680f8d15461..a63a1f2006eb33756dd5b3a5b0314b68e3ac74fd 100644 --- a/layouts/v7/modules/Vtiger/AdvanceSearch.tpl +++ b/layouts/v7/modules/Vtiger/AdvanceSearch.tpl @@ -55,7 +55,10 @@ </form> </div> {* </div>*} - </div></div></div> + </div></div> + <div class="searchResults"> + </div> + </div> <div class="modal-overlay-footer clearfix padding0px border0"> <div class="row clearfix"> <div class="col-lg-5 col-md-5 col-sm-5"> </div> @@ -84,8 +87,6 @@ <div> </div> </div> <div class="col-lg-2 col-md-1 hidden-xs hidden-sm"> </div> - <div class="searchResults"> - </div> </div></div> {/strip} diff --git a/layouts/v7/modules/Vtiger/resources/AdvanceSearch.js b/layouts/v7/modules/Vtiger/resources/AdvanceSearch.js index 0eda8c92168deb5c5072a762ad0dd98f31fd3a30..9283949184b7b88db039caa86afc46eb7a7d82b7 100644 --- a/layouts/v7/modules/Vtiger/resources/AdvanceSearch.js +++ b/layouts/v7/modules/Vtiger/resources/AdvanceSearch.js @@ -129,6 +129,9 @@ Vtiger_BasicSearch_Js("Vtiger_AdvanceSearch_Js",{ var thisInstance = this; this.getAdvanceSearch().then( function(data){ + jQuery('#advanceSearchButton').prop('disabled',false); + jQuery('#advanceSave').prop('disabled',false); + jQuery('#advanceIntiateSave').prop('disabled',false); thisInstance.showAdvanceSearch(data).then(function(){ thisInstance.setContainer(jQuery('#advanceSearchContainer')); vtUtils.showSelect2ElementView(thisInstance.getContainer().find('select.select2')); @@ -328,8 +331,10 @@ Vtiger_BasicSearch_Js("Vtiger_AdvanceSearch_Js",{ //To perform validation registration only once if(!this.filterValidationRegistered){ this.filterValidationRegistered = true; - controlForm.validationEngine({ - 'onValidationComplete' : validationDone + controlForm.vtValidate({ + success : function(){ + thisInstance.formValidationDeferred.resolve(); + } }); } //This will trigger the validation