From 6c6b601a35d37d87b4a05aebaffcd66d198d30de Mon Sep 17 00:00:00 2001 From: Aizizi Yigaimu Date: Mon, 5 Aug 2019 17:11:32 -0400 Subject: [PATCH 1/2] Add condition check for removed user --- src/containers/BGroup/BGroupItem.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/containers/BGroup/BGroupItem.js b/src/containers/BGroup/BGroupItem.js index 5de7007a..5b965111 100644 --- a/src/containers/BGroup/BGroupItem.js +++ b/src/containers/BGroup/BGroupItem.js @@ -14,7 +14,10 @@ class BGroupItem extends Component { const viewUser = this.props.user.permissions['view::allUsers']; let displayText = 'Created'; - let username = this.props.user_created.name; + let username = 'Removed User'; + if (this.props.user_created !== undefined) { + username = this.props.user_created.name; + } let displayTime = bGroup.time_created.toLocaleString(); if (bGroup.time_modified !== null && bGroup.time_modified !== undefined -- GitLab From 69b5bd0ffb8cc6edf263d99beb69f44b9acda2f9 Mon Sep 17 00:00:00 2001 From: Aizizi Yigaimu Date: Mon, 5 Aug 2019 17:19:30 -0400 Subject: [PATCH 2/2] Change if condition format --- src/containers/BGroup/BGroupItem.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/containers/BGroup/BGroupItem.js b/src/containers/BGroup/BGroupItem.js index 5b965111..b13a6d14 100644 --- a/src/containers/BGroup/BGroupItem.js +++ b/src/containers/BGroup/BGroupItem.js @@ -14,10 +14,8 @@ class BGroupItem extends Component { const viewUser = this.props.user.permissions['view::allUsers']; let displayText = 'Created'; - let username = 'Removed User'; - if (this.props.user_created !== undefined) { - username = this.props.user_created.name; - } + // In case the user not exist anymore, we set initial value + let username = (this.props.user_created !== undefined) ? this.props.user_created.name : 'Removed User'; let displayTime = bGroup.time_created.toLocaleString(); if (bGroup.time_modified !== null && bGroup.time_modified !== undefined -- GitLab