From b60ba869e0b7e3ac4a5e63787b6511d307a53d06 Mon Sep 17 00:00:00 2001 From: Amndeep Singh Mann Date: Tue, 30 Jul 2024 17:37:46 -0400 Subject: [PATCH] cleaned up message code Signed-off-by: Amndeep Singh Mann --- .../components/cards/controltable/ControlRowCol.vue | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/apps/frontend/src/components/cards/controltable/ControlRowCol.vue b/apps/frontend/src/components/cards/controltable/ControlRowCol.vue index 5c6d74a018..e714ba070d 100644 --- a/apps/frontend/src/components/cards/controltable/ControlRowCol.vue +++ b/apps/frontend/src/components/cards/controltable/ControlRowCol.vue @@ -79,13 +79,9 @@ export default class ControlRowCol extends mixins(HtmlSanitizeMixin) { // Check if either `skip_message` or `message` exist // If one but not the other exists, display the individual message // Otherwise display both messages in a joint string - if (this.result.skip_message) { - return this.result.message - ? `-Message-\n${this.result.message}\n\n-Skip Message-\n${this.result.skip_message}` - : this.result.skip_message; - } else { - return this.result.message; - } + return this.result.skip_message && this.result.message + ? `-Message-\n${this.result.message}\n\n-Skip Message-\n${this.result.skip_message}` + : this.result.message || this.result.skip_message; } }