From 51632e367cce51c04abdd7b6f9bf339295ee4d6e Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Sat, 31 Dec 2016 12:59:20 +1300 Subject: [PATCH] fix(service-details): allow to specify the 0 value for replicas (#441) --- app/components/service/serviceController.js | 3 ++- gruntfile.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/components/service/serviceController.js b/app/components/service/serviceController.js index e33db7dab..5181d0a47 100644 --- a/app/components/service/serviceController.js +++ b/app/components/service/serviceController.js @@ -25,7 +25,8 @@ function ($scope, $stateParams, $state, Service, ServiceHelper, Task, Node, Mess service.EditImage = false; }; $scope.scaleService = function scaleService(service) { - updateServiceAttribute(service, 'Replicas', service.newServiceReplicas || service.Replicas); + var replicas = service.newServiceReplicas === null || isNaN(service.newServiceReplicas) ? service.Replicas : service.newServiceReplicas; + updateServiceAttribute(service, 'Replicas', replicas); service.EditReplicas = false; }; diff --git a/gruntfile.js b/gruntfile.js index 686708c47..bd525ca6c 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -382,14 +382,14 @@ module.exports = function (grunt) { command: [ 'docker stop portainer', 'docker rm portainer', - 'docker run -d -p 9000:9000 -v /tmp/portainer:/data --name portainer portainer -H tcp://10.0.7.10:2375 --swarm -d /data' + 'docker run -d -p 9000:9000 -v /tmp/portainer:/data --name portainer portainer -H tcp://10.0.7.10:2375 -d /data' ].join(';') }, runSwarmLocal: { command: [ 'docker stop portainer', 'docker rm portainer', - 'docker run -d -p 9000:9000 -v /var/run/docker.sock:/var/run/docker.sock --name portainer portainer --swarm' + 'docker run -d -p 9000:9000 -v /var/run/docker.sock:/var/run/docker.sock --name portainer portainer' ].join(';') }, runSsl: {