fix conflict

1 files changed, 30 insertions, 1 deletions

diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index ba3042d78..c9eb09c00 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -297,7 +297,7 @@ export function getLogs(success, error) {
         dataType: 'json',
         contentType: 'application/json',
         type: 'GET',
-        success: success,
+        success,
         error: function onError(xhr, status, err) {
             var e = handleError('getLogs', xhr, status, err);
             error(e);
@@ -305,6 +305,35 @@ export function getLogs(success, error) {
     });
 }
 
+export function getConfig(success, error) {
+    $.ajax({
+        url: '/api/v1/admin/config',
+        dataType: 'json',
+        contentType: 'application/json',
+        type: 'GET',
+        success,
+        error: function onError(xhr, status, err) {
+            var e = handleError('getConfig', xhr, status, err);
+            error(e);
+        }
+    });
+}
+
+export function saveConfig(config, success, error) {
+    $.ajax({
+        url: '/api/v1/admin/save_config',
+        dataType: 'json',
+        contentType: 'application/json',
+        type: 'POST',
+        data: JSON.stringify(config),
+        success,
+        error: function onError(xhr, status, err) {
+            var e = handleError('saveConfig', xhr, status, err);
+            error(e);
+        }
+    });
+}
+
 export function getMeSynchronous(success, error) {
     var currentUser = null;
     $.ajax({