From 9404810a1c14bda4ed9fb9544c19cb16a759cf87 Mon Sep 17 00:00:00 2001
From: AllForNothing <sshijun@vmware.com>
Date: Thu, 18 Jul 2019 17:12:26 +0800
Subject: [PATCH] fix issue : time shown for scheduled scanning is incorrect

Signed-off-by: AllForNothing <sshijun@vmware.com>
---
 .../lib/src/config/system/system-settings.component.html    | 1 +
 .../vulnerability/vulnerability-config.component.html       | 6 +++---
 .../project-policy-config.component.html                    | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/portal/lib/src/config/system/system-settings.component.html b/src/portal/lib/src/config/system/system-settings.component.html
index 1fcb25051..803348995 100644
--- a/src/portal/lib/src/config/system/system-settings.component.html
+++ b/src/portal/lib/src/config/system/system-settings.component.html
@@ -99,6 +99,7 @@
                                     class="btn btn-link">{{'CVE_WHITELIST.ADD'|translate}}</button>
                         </div>
                         <div class="add-modal" *ngIf="showAddModal">
+                            <clr-icon (click)="showAddModal=false" class="float-lg-right margin-top-4" shape="window-close"></clr-icon>
                             <div>
                                 <clr-textarea-container>
                                     <label>{{'CVE_WHITELIST.ENTER'|translate}}</label>
diff --git a/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html b/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html
index 7dc12abf4..c0023b470 100644
--- a/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html
+++ b/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html
@@ -11,17 +11,17 @@
             </clr-tooltip>
             <clr-dropdown *ngIf="isClairDBFullyReady && showScanningNamespaces" class="clr-dropdown-override">
                 <button class="btn btn-link btn-font" clrDropdownToggle>
-                  {{ updatedTimestamp | date:'MM/dd/y HH:mm:ss' }} AM
+                  {{ updatedTimestamp | date:'short' }}
                   <clr-icon shape="caret down"></clr-icon>
                 </button>
                 <clr-dropdown-menu [clrPosition]="'bottom-right'" class="dropdown-namespace">
                     <div *ngFor="let nt of namespaceTimestamps" class="namespace">
                       <span class="label label-info">{{nt.namespace}}</span>
-                      <span>{{ convertToLocalTime(nt.last_update) | date:'MM/dd/y HH:mm:ss'}} AM</span>
+                      <span>{{ convertToLocalTime(nt.last_update) | date:'short'}} </span>
                     </div>
                 </clr-dropdown-menu>
             </clr-dropdown>
-            <span *ngIf="isClairDBFullyReady && !showScanningNamespaces">{{ updatedTimestamp | date:'MM/dd/y HH:mm:ss' }} AM</span>
+            <span *ngIf="isClairDBFullyReady && !showScanningNamespaces">{{ updatedTimestamp | date:'short' }} </span>
         </div>
         <div class="button-group">
           <cron-selection #CronScheduleComponent [labelCurrent]="getLabelCurrent" [labelEdit]='getLabelCurrent' [originCron]='originCron' (inputvalue)="scanAll($event)"></cron-selection>
diff --git a/src/portal/lib/src/project-policy-config/project-policy-config.component.html b/src/portal/lib/src/project-policy-config/project-policy-config.component.html
index 9dcd87aa1..31912edc3 100644
--- a/src/portal/lib/src/project-policy-config/project-policy-config.component.html
+++ b/src/portal/lib/src/project-policy-config/project-policy-config.component.html
@@ -109,6 +109,7 @@
                                     class="btn btn-link ml-1">{{'CVE_WHITELIST.ADD_SYSTEM'|translate}}</button>
                         </div>
                         <div class="add-modal" *ngIf="showAddModal && !isUseSystemWhitelist()">
+                            <clr-icon (click)="showAddModal=false" class="float-lg-right margin-top-4" shape="window-close"></clr-icon>
                             <div>
                                 <clr-textarea-container>
                                     <label>{{'CVE_WHITELIST.ENTER'|translate}}</label>