From 653e8a738d47db3cf480ff4693223818c3a9802a Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 29 Jul 2015 11:01:19 +0200
Subject: [PATCH] (ids) rearrange some template code

---
 .../mvc/app/views/OPNsense/IDS/index.volt     | 56 ++++++++++++-------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/opnsense/mvc/app/views/OPNsense/IDS/index.volt b/src/opnsense/mvc/app/views/OPNsense/IDS/index.volt
index 38861420c..c2c64403f 100644
--- a/src/opnsense/mvc/app/views/OPNsense/IDS/index.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/IDS/index.volt
@@ -122,29 +122,23 @@ POSSIBILITY OF SUCH DAMAGE.
 
         /**
          * save (general) settings and reconfigure
+         * @param  callback_funct: callback function, receives result status true/false
          */
-        function actionReconfigure() {
+        function actionReconfigure(callback_funct) {
+            var result_status = false;
             saveFormToEndpoint(url="/api/ids/settings/set",formid='frm_GeneralSettings',callback_ok=function(){
-                $("#reconfigureAct_progress").addClass("fa fa-spinner fa-pulse");
                 ajaxCall(url="/api/ids/service/reconfigure", sendData={}, callback=function(data,status) {
-                    // when done, disable progress animation.
-                    $("#reconfigureAct_progress").removeClass("fa fa-spinner fa-pulse");
-                    updateStatus();
-
-                    if (status != "success" || data['status'].toLowerCase().trim() != "ok") {
-                        BootstrapDialog.show({
-                            type: BootstrapDialog.TYPE_WARNING,
-                            title: "Error reconfiguring IDS",
-                            message: data['status'],
-                            draggable: true
-                        });
+                    if (status == "success" || data['status'].toLowerCase().trim() == "ok") {
+                        result_status = true;
                     }
+                    callback_funct(result_status);
                 });
             });
         }
 
-        loadGeneralSettings();
-        updateStatus();
+        /*************************************************************************************************************
+         * UI load grids (on tab change)
+         *************************************************************************************************************/
 
         /**
          * load content on tab changes
@@ -233,14 +227,28 @@ POSSIBILITY OF SUCH DAMAGE.
                 });
 
         /*************************************************************************************************************
-         * Commands
+         * UI button Commands
          *************************************************************************************************************/
 
         /**
          * save settings and reconfigure ids
          */
         $("#reconfigureAct").click(function(){
-            actionReconfigure();
+            $("#reconfigureAct_progress").addClass("fa fa-spinner fa-pulse");
+            actionReconfigure(function(status){
+                // when done, disable progress animation.
+                $("#reconfigureAct_progress").removeClass("fa fa-spinner fa-pulse");
+                updateStatus();
+
+                if (!status) {
+                    BootstrapDialog.show({
+                        type: BootstrapDialog.TYPE_WARNING,
+                        title: "Error reconfiguring IDS",
+                        message: data['status'],
+                        draggable: true
+                    });
+                }
+            });
         });
 
         /**
@@ -250,17 +258,25 @@ POSSIBILITY OF SUCH DAMAGE.
             $("#updateRulesAct_progress").addClass("fa fa-spinner fa-pulse");
             ajaxCall(url="/api/ids/service/updateRules", sendData={}, callback=function(data,status) {
                 // when done, disable progress animation and reload grid.
-                $("#updateRulesAct_progress").removeClass("fa fa-spinner fa-pulse");
                 $('#grid-rule-files').bootgrid('reload');
                 updateStatus();
                 if ($('#scheduled_updates').is(':hidden') ){
                     // save and reconfigure on initial download (tries to create a cron job)
-                    actionReconfigure();
-                    loadGeneralSettings();
+                    actionReconfigure(function(status){
+                        loadGeneralSettings();
+                        $("#updateRulesAct_progress").removeClass("fa fa-spinner fa-pulse");
+                    });
+                } else {
+                    $("#updateRulesAct_progress").removeClass("fa fa-spinner fa-pulse");
                 }
             });
         });
 
+        /**
+         * Initialize
+         */
+        loadGeneralSettings();
+        updateStatus();
 
     });