From 645e9331b0cb33119b5092b19a25437df856ca11 Mon Sep 17 00:00:00 2001 From: sshijun Date: Thu, 17 Oct 2019 09:23:45 +0800 Subject: [PATCH] Remove CVE ID check Signed-off-by: sshijun --- .../config/system/system-settings.component.ts | 15 ++------------- .../project-policy-config.component.ts | 15 ++------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/src/portal/lib/src/config/system/system-settings.component.ts b/src/portal/lib/src/config/system/system-settings.component.ts index 64f8f1263..6238e9a93 100644 --- a/src/portal/lib/src/config/system/system-settings.component.ts +++ b/src/portal/lib/src/config/system/system-settings.component.ts @@ -339,19 +339,8 @@ export class SystemSettingsComponent implements OnChanges, OnInit { } isDisabled(): boolean { - if (this.cveIds) { - let arr = this.cveIds.split(/[\n,]+/); - let flag = false; - for (let i = 0; i < arr.length; i++) { - let id = arr[i].trim(); - if (!/^CVE-[\d]+-[\d]+$/.test(id)) { - flag = true; - break; - } - } - return flag; - } - return true; + let str = this.cveIds; + return !(str && str.trim()); } get expiresDate() { diff --git a/src/portal/lib/src/project-policy-config/project-policy-config.component.ts b/src/portal/lib/src/project-policy-config/project-policy-config.component.ts index 1727ad04e..e0aa85381 100644 --- a/src/portal/lib/src/project-policy-config/project-policy-config.component.ts +++ b/src/portal/lib/src/project-policy-config/project-policy-config.component.ts @@ -303,19 +303,8 @@ export class ProjectPolicyConfigComponent implements OnInit { } isDisabled(): boolean { - if (this.cveIds) { - let arr = this.cveIds.split(/[\n,]+/); - let flag = false; - for (let i = 0; i < arr.length; i++) { - let id = arr[i].trim(); - if (!/^CVE-[\d]+-[\d]+$/.test(id)) { - flag = true; - break; - } - } - return flag; - } - return true; + let str = this.cveIds; + return !(str && str.trim()); } get expiresDate() {