diff --git a/src/js/client.js b/src/js/client.js index b55e67e91..94efbdf95 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -686,26 +686,29 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N }).error(defaultErrorHandler(callback)); }; - Client.prototype.getAddon = function (addon, callback) { - get('/api/v1/addons/' + addon).success(function (data, status) { + Client.prototype.getAddon = function (addonName, callback) { + get('/api/v1/addons/' + addonName).success(function (data, status) { if (status !== 200 || typeof data !== 'object') return callback(new ClientError(status, data)); callback(null, data.addon); }).error(defaultErrorHandler(callback)); }; Client.prototype.configureAddon = function (addonName, memoryLimit, callback) { - callback(new Error('not implemented')); - }; - - Client.prototype.startAddon = function (addon, callback) { - post('/api/v1/addons/' + addon + '/start').success(function (data, status) { + post('/api/v1/addons/' + addonName, { memory: memoryLimit }).success(function (data, status) { if (status !== 202) return callback(new ClientError(status, data)); callback(null); }).error(defaultErrorHandler(callback)); }; - Client.prototype.stopAddon = function (addon, callback) { - post('/api/v1/addons/' + addon + '/stop').success(function (data, status) { + Client.prototype.startAddon = function (addonName, callback) { + post('/api/v1/addons/' + addonName + '/start').success(function (data, status) { + if (status !== 202) return callback(new ClientError(status, data)); + callback(null); + }).error(defaultErrorHandler(callback)); + }; + + Client.prototype.stopAddon = function (addonName, callback) { + post('/api/v1/addons/' + addonName + '/stop').success(function (data, status) { if (status !== 202) return callback(new ClientError(status, data)); callback(null); }).error(defaultErrorHandler(callback)); diff --git a/src/views/addons.js b/src/views/addons.js index ea8d2c48b..513de8cdb 100644 --- a/src/views/addons.js +++ b/src/views/addons.js @@ -62,7 +62,7 @@ angular.module('Application').controller('AddonsController', ['$scope', '$locati $scope.addonConfigure.memoryTicks = []; var npow2 = Math.pow(2, Math.ceil(Math.log($scope.config.memory)/Math.log(2))); for (var i = 256; i <= (npow2*2/1024/1024); i *= 2) { - if (i >= (addon.config.memory/1024/1024 || 0)) $scope.addonConfigure.memoryTicks.push(i * 1024 * 1024); + $scope.addonConfigure.memoryTicks.push(i * 1024 * 1024); } $('#addonConfigureModal').modal('show'); @@ -79,11 +79,11 @@ angular.module('Application').controller('AddonsController', ['$scope', '$locati return; } - $('#addonConfigureModal').modal('hide'); - $scope.addonConfigure.reset(); - // reload the addon refresh($scope.addonConfigure.addon.name); + + $('#addonConfigureModal').modal('hide'); + $scope.addonConfigure.reset(); }); },