[GEARPUMP-270] Disable 'Kill' button when applciation is not running
Author: huafengw <fvunicorn@gmail.com>
Closes #146 from huafengw/fix270.
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 @@
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 db235a1..63fc7ee 100644
--- a/services/dashboard/views/apps/apps.js
+++ b/services/dashboard/views/apps/apps.js
@@ -109,7 +109,7 @@
},
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();
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 {
+
+}
