diff --git a/api/controllers/SnapshotController.js b/api/controllers/SnapshotController.js index fe9b96499..202e55b06 100644 --- a/api/controllers/SnapshotController.js +++ b/api/controllers/SnapshotController.js @@ -126,8 +126,6 @@ module.exports = _.merge(_.cloneDeep(require('../base/Controller')), { fns.push(function(cb){ KongService.createFromEndpointCb("/" + key,item,function(err,created){ - console.log("######################",item); - if(!responseData[key]) { responseData[key] = { imported : 0, diff --git a/api/services/KongService.js b/api/services/KongService.js index 573114417..2ead8c9c0 100644 --- a/api/services/KongService.js +++ b/api/services/KongService.js @@ -27,17 +27,13 @@ var KongService = { createFromEndpointCb: function (endpoint,data, cb) { - if(data.config) { - Object.keys(data.config).forEach(function(key){ - data["config." + key] = data.config[key] - }) - - delete data.config - } - unirest.post(sails.config.kong_admin_url + endpoint) + .header('Content-Type', 'application/json') .send(data) .end(function (response) { + //if(data.name == "request-transformer") { + // console.log(response.error) + //} if (response.error) return cb(response) return cb(null,response.body) }) diff --git a/assets/js/app/settings/snapshots/snapshot-apply-modal.html b/assets/js/app/settings/snapshots/snapshot-apply-modal.html index 670c10809..f6573a1da 100644 --- a/assets/js/app/settings/snapshots/snapshot-apply-modal.html +++ b/assets/js/app/settings/snapshots/snapshot-apply-modal.html @@ -63,7 +63,6 @@
Applying snapshot to "{{user.node.name}}". Please wait...

{{value.failed.items.join(", ")}}

- diff --git a/views/layout.ejs b/views/layout.ejs index a4ea66d78..1f2326e64 100644 --- a/views/layout.ejs +++ b/views/layout.ejs @@ -31,15 +31,15 @@ - - - - - - - - - + + + + + + + + + @@ -101,151 +101,151 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +