From 5f1e1b989b573c7f13f415ae3d2bb6020fe750d7 Mon Sep 17 00:00:00 2001 From: abalabahaha Date: Fri, 15 Apr 2016 19:30:01 -0700 Subject: [PATCH] updateServer with options --- lib/Client/InternalClient.js | 11 +++++++++-- src/Client/InternalClient.js | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js index 69c91cbd1..730150d95 100644 --- a/lib/Client/InternalClient.js +++ b/lib/Client/InternalClient.js @@ -497,7 +497,7 @@ var InternalClient = (function () { //def updateServer - InternalClient.prototype.updateServer = function updateServer(server, name, region) { + InternalClient.prototype.updateServer = function updateServer(server, options) { var _this9 = this; var server = this.resolver.resolveServer(server); @@ -505,7 +505,14 @@ var InternalClient = (function () { return Promise.reject(new Error("server did not resolve")); } - return this.apiRequest("patch", _Constants.Endpoints.SERVER(server.id), true, { name: name || server.name, region: region || server.region }).then(function (res) { + if (!options.name) { + options.name = server.name; + } + if (!options.region) { + options.region = server.region; + } + + return this.apiRequest("patch", _Constants.Endpoints.SERVER(server.id), true, options).then(function (res) { // wait until the name and region are updated return waitFor(function () { return _this9.servers.get("name", res.name) ? _this9.servers.get("name", res.name).region === res.region ? _this9.servers.get("id", res.id) : false : false; diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js index 29b35aee5..b84b074b3 100644 --- a/src/Client/InternalClient.js +++ b/src/Client/InternalClient.js @@ -407,13 +407,20 @@ export default class InternalClient { } //def updateServer - updateServer(server, name, region) { + updateServer(server, options) { var server = this.resolver.resolveServer(server); if (!server) { return Promise.reject(new Error("server did not resolve")); } - return this.apiRequest("patch", Endpoints.SERVER(server.id), true, { name: name || server.name, region: region || server.region }) + if (!options.name) { + options.name = server.name; + } + if (!options.region) { + options.region = server.region; + } + + return this.apiRequest("patch", Endpoints.SERVER(server.id), true, options) .then(res => { // wait until the name and region are updated return waitFor(() =>