Skip to content

Commit 255a917

Browse files
authored
Merge pull request #1175 from nscuro/backport-pr-1174
2 parents f42198e + 7d62191 commit 255a917

File tree

1 file changed

+33
-23
lines changed

1 file changed

+33
-23
lines changed

src/views/portfolio/projects/Project.vue

+33-23
Original file line numberDiff line numberDiff line change
@@ -313,39 +313,43 @@
313313
v-b-tooltip.hover
314314
:title="$t('policy_violation.total')"
315315
>{{
316-
showSuppressedViolations
316+
policyViolationsTotal
317+
/*showSuppressedViolations
317318
? policyViolationsTotal
318-
: policyViolationsUnaudited
319+
: policyViolationsUnaudited*/
319320
}}</b-badge
320321
>
321322
<b-badge
322323
variant="tab-info"
323324
v-b-tooltip.hover
324325
:title="$t('policy_violation.infos')"
325326
>{{
326-
showSuppressedViolations
327+
policyViolationsInfoTotal
328+
/*showSuppressedViolations
327329
? policyViolationsInfoTotal
328-
: policyViolationsInfoUnaudited
330+
: policyViolationsInfoUnaudited*/
329331
}}</b-badge
330332
>
331333
<b-badge
332334
variant="tab-warn"
333335
v-b-tooltip.hover
334336
:title="$t('policy_violation.warns')"
335337
>{{
336-
showSuppressedViolations
338+
policyViolationsWarnTotal
339+
/*showSuppressedViolations
337340
? policyViolationsWarnTotal
338-
: policyViolationsWarnUnaudited
341+
: policyViolationsWarnUnaudited*/
339342
}}</b-badge
340343
>
341344
<b-badge
342345
variant="tab-fail"
343346
v-b-tooltip.hover
344347
:title="$t('policy_violation.fails')"
345348
>{{
346-
showSuppressedViolations
349+
policyViolationsFailTotal
350+
/*showSuppressedViolations
347351
? policyViolationsFailTotal
348-
: policyViolationsFailUnaudited
352+
: policyViolationsFailUnaudited*/
349353
}}</b-badge
350354
>
351355
</template>
@@ -451,11 +455,14 @@ export default {
451455
policyViolationsTotal: 0,
452456
policyViolationsUnaudited: 0,
453457
policyViolationsFailTotal: 0,
454-
policyViolationsFailUnaudited: 0,
458+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
459+
// policyViolationsFailUnaudited: 0,
455460
policyViolationsWarnTotal: 0,
456-
policyViolationsWarnUnaudited: 0,
461+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
462+
// policyViolationsWarnUnaudited: 0,
457463
policyViolationsInfoTotal: 0,
458-
policyViolationsInfoUnaudited: 0,
464+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
465+
// policyViolationsInfoUnaudited: 0,
459466
tabIndex: 0,
460467
};
461468
},
@@ -522,26 +529,29 @@ export default {
522529
this.project.metrics.policyViolationsFail,
523530
0,
524531
);
525-
this.policyViolationsFailUnaudited = common.valueWithDefault(
526-
this.project.metrics.policyViolationsFailUnaudited,
527-
0,
528-
);
532+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
533+
// this.policyViolationsFailUnaudited = common.valueWithDefault(
534+
// this.project.metrics.policyViolationsFailUnaudited,
535+
// 0,
536+
// );
529537
this.policyViolationsWarnTotal = common.valueWithDefault(
530538
this.project.metrics.policyViolationsWarn,
531539
0,
532540
);
533-
this.policyViolationsWarnUnaudited = common.valueWithDefault(
534-
this.project.metrics.policyViolationsWarnUnaudited,
535-
0,
536-
);
541+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
542+
// this.policyViolationsWarnUnaudited = common.valueWithDefault(
543+
// this.project.metrics.policyViolationsWarnUnaudited,
544+
// 0,
545+
// );
537546
this.policyViolationsInfoTotal = common.valueWithDefault(
538547
this.project.metrics.policyViolationsInfo,
539548
0,
540549
);
541-
this.policyViolationsInfoUnaudited = common.valueWithDefault(
542-
this.project.metrics.policyViolationsInfoUnaudited,
543-
0,
544-
);
550+
// TODO: Requires https://github.com/DependencyTrack/dependency-track/pull/3615.
551+
// this.policyViolationsInfoUnaudited = common.valueWithDefault(
552+
// this.project.metrics.policyViolationsInfoUnaudited,
553+
// 0,
554+
// );
545555
EventBus.$emit('addCrumb', this.projectLabel);
546556
this.$title = this.projectLabel;
547557
});

0 commit comments

Comments
 (0)