From bcbc713ad977e1b8f74c9958117417bddb5e8e12 Mon Sep 17 00:00:00 2001
From: Alexander Moisseev <moiseev@mezonplus.ru>
Date: Sat, 11 Aug 2018 17:52:21 +0300
Subject: [PATCH] [Minor] Combine saveMap functions

---
 interface/js/app/config.js | 50 +++++++++-----------------------------
 1 file changed, 11 insertions(+), 39 deletions(-)

diff --git a/interface/js/app/config.js b/interface/js/app/config.js
index 19bc234eca..1e0aa2829b 100644
--- a/interface/js/app/config.js
+++ b/interface/js/app/config.js
@@ -27,36 +27,6 @@ define(["jquery"],
         "use strict";
         var ui = {};
 
-        function save_map_success(rspamd) {
-            rspamd.alertMessage("alert-modal alert-success", "Map data successfully saved");
-            $("#modalDialog").modal("hide");
-        }
-        function save_map_error(rspamd, serv, jqXHR, textStatus, errorThrown) {
-            var serv_name = (typeof serv === "string") ? serv : serv.name;
-            rspamd.alertMessage("alert-modal alert-error", "Save map error on " +
-                serv_name + ": " + errorThrown);
-        }
-        // @upload map from modal
-        function saveMap(rspamd, action, id) {
-            var data = $("#" + id).find("textarea").val();
-            $.ajax({
-                data: data,
-                dataType: "text",
-                type: "POST",
-                jsonp: false,
-                url: action,
-                beforeSend: function (xhr) {
-                    xhr.setRequestHeader("Password", rspamd.getPassword());
-                    xhr.setRequestHeader("Map", id);
-                    xhr.setRequestHeader("Debug", true);
-                },
-                error: function (jqXHR) {
-                    save_map_error(rspamd, "local", null, null, jqXHR.statusText);
-                },
-                success: function () { save_map_success(rspamd); },
-            });
-        }
-
         function loadActionsFromForm() {
             var values = [];
             var inputs = $("#actionsForm :input[data-id=\"action\"]");
@@ -240,20 +210,15 @@ define(["jquery"],
                 $("#modalBody form").hide();
             });
             // @save forms from modal
-            $("#modalSave").on("click", function () {
-                var form = $("#modalBody").children().filter(":visible");
-                var action = $(form).attr("action");
-                var id = $(form).attr("id");
-                saveMap(rspamd, action, id);
-            });
-            $("#modalSaveAll").on("click", function () {
+            function saveMap(server) {
                 var form = $("#modalBody").children().filter(":visible");
                 var action = $(form).attr("action");
                 var id = $(form).attr("id");
                 var data = $("#" + id).find("textarea").val();
                 rspamd.query(action, {
                     success: function () {
-                        save_map_success(rspamd);
+                        rspamd.alertMessage("alert-success", "Map data successfully saved");
+                        $("#modalDialog").modal("hide");
                     },
                     errorMessage: "Save map error",
                     method: "POST",
@@ -263,8 +228,15 @@ define(["jquery"],
                     params:{
                         data: data,
                         dataType: "text",
-                    }
+                    },
+                    server: server
                 });
+            }
+            $("#modalSave").on("click", function () {
+                saveMap();
+            });
+            $("#modalSaveAll").on("click", function () {
+                saveMap("All SERVERS");
             });
         };
 
-- 
2.47.3