Skip to content

Commit 90e1b44

Browse files
authored
Merge pull request #152 from nscuro/issue-151
Fix usages of `cwe` field instead of `cwes`
2 parents 3fe6bf7 + 967fc63 commit 90e1b44

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

src/views/portfolio/projects/ComponentVulnerabilities.vue

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,19 @@
4949
},
5050
{
5151
title: this.$t('message.cwe'),
52-
field: "cwe",
52+
field: "cwes",
5353
sortable: false,
5454
formatter(value, row, index) {
5555
if (typeof value !== 'undefined') {
56-
return `CWE-${value.cweId} ${value.name}`;
56+
let s = '';
57+
for(let i = 0; i < value.length; i++) {
58+
let cwe = value[i];
59+
if (i > 0) {
60+
s += ',&nbsp;&nbsp;&nbsp;'
61+
}
62+
s += `CWE-${cwe.cweId}`
63+
}
64+
return s;
5765
}
5866
}
5967
},

src/views/portfolio/vulnerabilities/VulnerabilityCreateVulnerabilityModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ export default {
493493
severity: (this.vulnerability.severity != null) ? this.vulnerability.severity : this.computedCvssSeverity,
494494
cvssV2Vector: this.generateCvssV2Vector(),
495495
cvssV3Vector: this.generateCvssV3Vector(),
496-
cwe: this.selectableCwes,
496+
cwes: this.selectableCwes,
497497
affectedComponents: this.vulnerability.affectedComponents
498498
}).then((response) => {
499499
this.$emit('refreshTable');

src/views/portfolio/vulnerabilities/VulnerabilityDetailsModal.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,8 @@ export default {
461461
vulnProp(newVuln, oldVuln) {
462462
if (!this.vulnerability.uuid) {
463463
this.vulnerability = newVuln;
464-
if (this.vulnerability.cwe && this.vulnerability.cwe.length > 0) {
465-
this.selectableCwes = this.vulnerability.cwe;
464+
if (this.vulnerability.cwes && this.vulnerability.cwes.length > 0) {
465+
this.selectableCwes = this.vulnerability.cwes;
466466
}
467467
}
468468
}
@@ -518,7 +518,7 @@ export default {
518518
severity: (this.vulnerability.severity != null) ? this.vulnerability.severity : this.computedCvssSeverity,
519519
cvssV2Vector: this.generateCvssV2Vector(),
520520
cvssV3Vector: this.generateCvssV3Vector(),
521-
cwe: this.selectableCwes,
521+
cwes: this.selectableCwes,
522522
affectedComponents: this.vulnerability.affectedComponents
523523
}).then((response) => {
524524
this.$emit('vulnerabilityUpdated', response.data);

src/views/portfolio/vulnerabilities/VulnerabilityList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
},
6969
{
7070
title: this.$t('message.cwe'),
71-
field: "cwe",
71+
field: "cwes",
7272
sortable: false,
7373
formatter(value, row, index) {
7474
if (typeof value !== 'undefined') {

0 commit comments

Comments
 (0)