#67 Fix a UI regression introduced by the migration of date fields in…

… the database
TheHive-Project · Jan 3, 2017 · cbbb86c · cbbb86c
1 parent aee7cc0
commit cbbb86c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ui/app/scripts/directives/flow/flow-item.js b/ui/app/scripts/directives/flow/flow-item.js
@@ -19,8 +19,8 @@
                     scope.getContentUrl = function() {
                         return 'views/directives/flow/' + scope.type + '.html';
                     };
-                    scope.gtime = function(startdate) {
-                        return moment(startdate, 'YYYYMMDDTHHmmssZZ').toDate().getTime();
+                    scope.gtime = function(startdate) {                        
+                        return moment(startdate).toDate().getTime();
                     };
                     scope.isImage = function(contentType) {
                         return angular.isString(contentType) && contentType.indexOf('image') === 0;

diff --git a/ui/app/views/directives/flow/operation.html b/ui/app/views/directives/flow/operation.html
@@ -14,7 +14,7 @@
     <span class="operation-user">{{getUserInfo.get(base.user) | getField: 'name'}}</span>
 
     <span class="operation-timer pull-right">
-        <i class="text-default glyphicon glyphicon-time"></i>
+        <i class="text-default glyphicon glyphicon-time"></i>        
     	<timer interval="30000" start-time="gtime(base.startDate)">
             {{millis  | amDurationFormat : 'milliseconds'}}
     	</timer>