Merge branch 'white/integracion' into white/master

Author: rgerman

gui/gtk/dialogs.py

@@ -1357,10 +1357,10 @@ def uncook(self, prop, original_type):
         """
 
         # XXX: params is a weird stupid thing that can come up as a string,
-        # a list, a nonetype, whatever. but we're making it _always_ be a list
+        # a list, a nonetype, whatever. but we're making it _always_ be a string
         # across faraday, so just force it to be so
         if prop == "params":
-            original_type = "string"
+            original_type = "str"
 
         if original_type == "list":
             if prop:

server/www/scripts/statusReport/controllers/statusReport.js

@@ -47,7 +47,7 @@ angular.module('faradayApp')
             $scope.severities = SEVERITIES;
             $scope.easeofresolution = EASEOFRESOLUTION;
             $scope.propertyGroupBy = $routeParams.groupbyId;
-            $scope.sortField = 'metadata.create_time';
+            $scope.sortField = 'date';
             $scope.reverse = true;
             $scope.vulns = [];
             $scope.selected = false;
@@ -220,7 +220,7 @@ angular.module('faradayApp')
                     '       <div ui-grid-filter></div>'+
                     '   </div>';
 
-            $scope.gridOptions.columnDefs.push({ name : 'metadata.create_time',
+            $scope.gridOptions.columnDefs.push({ name : 'date',
                 displayName : "date",
                 cellTemplate: 'scripts/statusReport/partials/ui-grid/columns/datecolumn.html',
                 headerCellTemplate: header,

server/www/scripts/statusReport/partials/ui-grid/columns/datecolumn.html

@@ -1 +1 @@
-<div ng-if="row.entity._id != undefined"><div ng-if="!col.grouping || col.grouping.groupPriority === undefined || col.grouping.groupPriority === null || ( row.groupHeader && col.grouping.groupPriority === row.treeLevel )" class="ui-grid-cell-contents white-space">{{COL_FIELD * 1000 | date:"MM/dd/yyyy"}}</div></div><div ng-if="row.groupHeader && col.grouping.groupPriority !== undefined" class="ui-grid-cell-contents white-space">{{COL_FIELD.split(" ")[0] * 1000 | date:"MM/dd/yyyy"}}</div>
+<div ng-if="row.entity._id != undefined"><div ng-if="!col.grouping || col.grouping.groupPriority === undefined || col.grouping.groupPriority === null || ( row.groupHeader && col.grouping.groupPriority === row.treeLevel )" class="ui-grid-cell-contents white-space">{{row.entity.metadata.create_time * 1000 | date:"MM/dd/yyyy"}}</div></div><div ng-if="row.groupHeader && col.grouping.groupPriority !== undefined" class="ui-grid-cell-contents white-space">{{row.entity.metadata.create_time.split(" ")[0] * 1000 | date:"MM/dd/yyyy"}}</div>