Merge branch "feat99-container-exec-event" into internal

2016-08-03 21:31:32 +12:00 · 2016-08-03 21:31:32 +12:00 · 20eecffc40
parent f4d90306b3 4a738ee362
commit 20eecffc40
3 changed files with 8 additions and 2 deletions
--- a/api/ui-for-docker
+++ b/api/ui-for-docker
--- a/app/shared/viewmodel.js
+++ b/app/shared/viewmodel.js
@ -58,7 +58,13 @@ function createEventDetails(event) {
      details = 'Container ' + eventAttr.name + ' unpaused';
      break;
      default:
-      details = 'Unsupported event';
+      if (event.Action.indexOf('exec_create') === 0) {
+        details = 'Exec instance created';
+      } else if (event.Action.indexOf('exec_start') === 0) {
+        details = 'Exec instance started';
+      } else {
+        details = 'Unsupported event';
+      }
    }
    break;
    case 'image':