diff --git a/client/htmls/public/containerLog.html b/client/htmls/public/containerLog.html
index d5fe96896..079c0a85c 100644
--- a/client/htmls/public/containerLog.html
+++ b/client/htmls/public/containerLog.html
@@ -40,19 +40,17 @@
Container Audit Trail Logs
| Time
|
- container |
+ Container |
+ Status |
Instance |
- Status |
Image |
- ActionStatus |
- InstanceIP |
- OS |
User |
Org |
BU |
Project |
Env |
Action |
+ ActionStatus |
Log |
@@ -112,7 +110,6 @@
url: url,
cache: false
}).done(function(data) {
- lastTimestamp = 0;
var $modalBody = $containerLogModalContainer.find('.logsArea')
if (clearData) {
$modalBody.empty();
@@ -184,8 +181,6 @@
getcontainers();
$("#refreshBtn").click(function() {
- pageSetting.page = 1;
- pageSetting.pageSize = 10;
pageSetting.sortBy = "createdOn";
pageSetting.sortOrder = "desc";
pageSetting.search = "";
@@ -231,44 +226,12 @@
$tr.append($tdCreatedOn);
var $tdcontainerName = $(' | ').append(managedData[i].containerName);
$tr.append($tdcontainerName);
- var $tdinstanceName = $(' | ').append(managedData[i].platformId);
- $tr.append($tdinstanceName);
var $tdStatus = $(' | ').append(managedData[i].status);
$tr.append($tdStatus);
+ var $tdinstanceName = $(' | ').append(managedData[i].instanceIP);
+ $tr.append($tdinstanceName);
var $tdImage = $(' | ').append(managedData[i].Image);
$tr.append($tdImage);
- if (managedData[i].actionStatus == 'success') {
- $tdActionStatus = $("
");
- }else if (managedData[i].actionStatus == 'pending' || managedData[i].actionStatus == 'waiting') {
- $tdActionStatus = $("
");
- }else if (managedData[i].actionStatus == 'failed') {
- $tdActionStatus = $("
");
- }else {
- $tdActionStatus = $("
");
- }
- var $tdActionStatus = $(' | ').append($tdActionStatus);
- $tr.append($tdActionStatus);
- var $tdInstanceIP = $(' | ').append(managedData[i].instanceIP);
- $tr.append($tdInstanceIP);
- if (managedData[i].platform == 'ubuntu') {
- $osImg = $("
");
- } else if (managedData[i].platform == 'centos') {
- $osImg = $("
");
- } else if (managedData[i].platform == 'unknown') {
- $osImg = $("
");
- } else if (managedData[i].os == 'windows') {
- $osImg = $("
");
- } else if (managedData[i].platform == 'unknown') {
- $osImg = $("
");
- } else if (managedData[i].os == 'linux' && managedData[i].platform == 'unknown') {
- $osImg = $("
");
- } else if (managedData[i].platform == 'unknown' && managedData[i].os == 'unknown') {
- $osImg = $("
");
- } else {
- $osImg = $("
");
- }
- var $tdOs = $(' | ').append($osImg);
- $tr.append($tdOs);
var $tdUser = $(' | ').append(managedData[i].user);
$tr.append($tdUser);
var $tdOrg = $(' | ').append(managedData[i].orgName);
@@ -281,6 +244,17 @@
$tr.append($environmentName);
var $tdAction = $(' | ').append(managedData[i].action);
$tr.append($tdAction);
+ if (managedData[i].actionStatus == 'success') {
+ $tdActionStatus = $("
");
+ }else if (managedData[i].actionStatus == 'pending' || managedData[i].actionStatus == 'waiting') {
+ $tdActionStatus = $("
");
+ }else if (managedData[i].actionStatus == 'failed') {
+ $tdActionStatus = $("
");
+ }else {
+ $tdActionStatus = $("
");
+ }
+ var $tdActionStatus = $(' | ').append($tdActionStatus);
+ $tr.append($tdActionStatus);
var $logIcon = $("
");
var $tdLog = $(' | ').append($logIcon);
$tr.append($tdLog);