From 56ec0a2b3edac0bf98ed62b4a4177480e44d0cf6 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 7 Aug 2018 18:55:39 +0200 Subject: [PATCH] Revert "mvc, apply tokenizer and selectpicker after form model to prevent tokenizer to fetching the wrong z-axis" This reverts commit b09775e5c9ed5775d349bc5f1dc64f8a13e018c8. --- .../www/js/opnsense_bootgrid_plugin.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/opnsense/www/js/opnsense_bootgrid_plugin.js b/src/opnsense/www/js/opnsense_bootgrid_plugin.js index 04a737354..b1bf4c23a 100644 --- a/src/opnsense/www/js/opnsense_bootgrid_plugin.js +++ b/src/opnsense/www/js/opnsense_bootgrid_plugin.js @@ -173,13 +173,14 @@ $.fn.UIBootgrid = function (params) { var urlMap = {}; urlMap['frm_' + editDlg] = gridParams['get'] + uuid; mapDataToFormUI(urlMap).done(function () { - // clear validation errors (if any) - clearFormValidation('frm_' + editDlg); - // show dialog for edit - $('#'+editDlg).modal({backdrop: 'static', keyboard: false}); // update selectors formatTokenizersUI(); $('.selectpicker').selectpicker('refresh'); + // clear validation errors (if any) + clearFormValidation('frm_' + editDlg); + + // show dialog for pipe edit + $('#'+editDlg).modal({backdrop: 'static', keyboard: false}); // define save action $("#btn_"+editDlg+"_save").unbind('click').click(function(){ if (gridParams['set'] != undefined) { @@ -207,13 +208,14 @@ $.fn.UIBootgrid = function (params) { var urlMap = {}; urlMap['frm_' + editDlg] = gridParams['get'] + uuid; mapDataToFormUI(urlMap).done(function () { - // clear validation errors (if any) - clearFormValidation('frm_' + editDlg); - // show dialog for edit - $('#'+editDlg).modal({backdrop: 'static', keyboard: false}); // update selectors formatTokenizersUI(); $('.selectpicker').selectpicker('refresh'); + // clear validation errors (if any) + clearFormValidation('frm_' + editDlg); + + // show dialog for pipe edit + $('#'+editDlg).modal({backdrop: 'static', keyboard: false}); // define save action $("#btn_"+editDlg+"_save").unbind('click').click(function(){ if (gridParams['add'] != undefined) {