From 61fb3b3b7c79be4c2fa530516481fcbc6b35485e Mon Sep 17 00:00:00 2001 From: huafengw Date: Mon, 13 Feb 2017 10:50:56 +0800 Subject: [PATCH] [GEARPUMP-270] disable 'Kill' button when applciation is not running --- services/dashboard/services/models/models.js | 2 +- services/dashboard/views/apps/apps.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/dashboard/services/models/models.js b/services/dashboard/services/models/models.js index 168d4e626..28d7d7e53 100644 --- a/services/dashboard/services/models/models.js +++ b/services/dashboard/services/models/models.js @@ -151,7 +151,7 @@ angular.module('org.apache.gearpump.models', []) return angular.merge(obj, { // extra properties isRunning: obj.status === 'active', - isKilled: obj.status === 'inactive', + isDead: !(obj.status === 'active' || obj.status === 'pending'), akkaAddr: decoder._akkaAddr(obj.appMasterPath), // extra methods pageUrl: locator.app(obj.appId, obj.type), diff --git a/services/dashboard/views/apps/apps.js b/services/dashboard/views/apps/apps.js index db235a13a..63fc7ee21 100644 --- a/services/dashboard/views/apps/apps.js +++ b/services/dashboard/views/apps/apps.js @@ -109,7 +109,7 @@ angular.module('dashboard') }, config: {href: app.configLink, target: '_blank', text: 'Config', class: 'btn-xs'}, kill: { - text: 'Kill', class: 'btn-xs', disabled: app.isKilled, + text: 'Kill', class: 'btn-xs', disabled: app.isDead, click: function () { $dialogs.confirm('Are you sure to kill this application?', function () { app.terminate();