From 5a07638f4d299793bd8c384c8355d64cf52f1a93 Mon Sep 17 00:00:00 2001
From: Thomas Krzero <thomas.kovatchitch@gmail.com>
Date: Thu, 27 Apr 2017 20:40:37 +0200
Subject: [PATCH] fix(container) - correct since date for created containers
 (#822)

---
 app/components/container/container.html         | 11 ++++++++---
 app/components/container/containerController.js |  2 ++
 app/filters/filters.js                          |  3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/components/container/container.html b/app/components/container/container.html
index 4a09e38eb..1693368a2 100644
--- a/app/components/container/container.html
+++ b/app/components/container/container.html
@@ -54,15 +54,20 @@
             <tr>
               <td>Status</td>
               <td>
-                <i ng-class="{true: 'fa fa-heartbeat space-right green-icon', false: 'fa fa-heartbeat space-right red-icon'}[container.State.Running]"></i>
-                {{ container.State|getstatetext }} since {{ activityTime }}<span ng-if="!container.State.Running"> with exit code {{ container.State.ExitCode }}</span>
+                <i class="fa fa-heartbeat space-right green-icon" ng-if="container.State.Running"></i>
+                <i class="fa fa-heartbeat space-right red-icon" ng-if="!container.State.Running && container.State.Status !== 'created'"></i>
+                {{ container.State|getstatetext }} since {{ activityTime }}<span ng-if="!container.State.Running && container.State.Status !== 'created'"> with exit code {{ container.State.ExitCode }}</span>
               </td>
             </tr>
+            <tr>
+              <td>Created</td>
+              <td>{{ container.Created|getisodate }}</td>
+            </tr>
             <tr ng-if="container.State.Running">
               <td>Start time</td>
               <td>{{ container.State.StartedAt|getisodate }}</td>
             </tr>
-            <tr ng-if="!container.State.Running">
+            <tr ng-if="!container.State.Running && container.State.Status !== 'created'">
               <td>Finished</td>
               <td>{{ container.State.FinishedAt|getisodate }}</td>
             </tr>
diff --git a/app/components/container/containerController.js b/app/components/container/containerController.js
index 7931481db..a79419cfe 100644
--- a/app/components/container/containerController.js
+++ b/app/components/container/containerController.js
@@ -23,6 +23,8 @@ function ($scope, $state, $stateParams, $filter, Container, ContainerCommit, Ima
 
       if (d.State.Running) {
         $scope.activityTime = moment.duration(moment(d.State.StartedAt).utc().diff(moment().utc())).humanize();
+      } else if (d.State.Status === "created") {
+        $scope.activityTime = moment.duration(moment(d.Created).utc().diff(moment().utc())).humanize();
       } else {
         $scope.activityTime = moment.duration(moment().utc().diff(moment(d.State.FinishedAt).utc())).humanize();
       }
diff --git a/app/filters/filters.js b/app/filters/filters.js
index c220ac20a..396e35d45 100644
--- a/app/filters/filters.js
+++ b/app/filters/filters.js
@@ -109,6 +109,9 @@ angular.module('portainer.filters', [])
     if (state.Running) {
       return 'Running';
     }
+    if (state.Status === 'created') {
+      return 'Created';
+    }
     return 'Stopped';
   };
 })