Repository: incubator-gearpump Updated Branches: refs/heads/master f56692ec8 -> d6cc5da7b
[GEARPUMP-270] Disable 'Kill' button when applciation is not running Author: huafengw <[email protected]> Closes #146 from huafengw/fix270. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/d6cc5da7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/d6cc5da7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/d6cc5da7 Branch: refs/heads/master Commit: d6cc5da7b58309a4f6ed9e2b0cefaaf4932eaa09 Parents: f56692e Author: huafengw <[email protected]> Authored: Mon Feb 13 12:44:04 2017 +0800 Committer: manuzhang <[email protected]> Committed: Mon Feb 13 12:44:11 2017 +0800 ---------------------------------------------------------------------- services/dashboard/services/models/models.js | 2 +- services/dashboard/views/apps/apps.js | 2 +- .../org/apache/gearpump/streaming/dsl/task/MergeTask.scala | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/d6cc5da7/services/dashboard/services/models/models.js ---------------------------------------------------------------------- diff --git a/services/dashboard/services/models/models.js b/services/dashboard/services/models/models.js index 168d4e6..28d7d7e 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), http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/d6cc5da7/services/dashboard/views/apps/apps.js ---------------------------------------------------------------------- diff --git a/services/dashboard/views/apps/apps.js b/services/dashboard/views/apps/apps.js index db235a1..63fc7ee 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(); http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/d6cc5da7/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/task/MergeTask.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/task/MergeTask.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/task/MergeTask.scala new file mode 100644 index 0000000..0c3c26a --- /dev/null +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/task/MergeTask.scala @@ -0,0 +1,8 @@ +package org.apache.gearpump.streaming.dsl.task + +/** + * Created by doriadong on 2017/2/13. + */ +class MergeTask { + +}
