From 18f5b0cc5efb86725cdfecc7c41f7d878c72e74f Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 8 Nov 2017 14:24:48 -0700 Subject: [PATCH] queue fix for sometimes null settings --- .../src/routes/Moderation/containers/Moderation.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index 1161ad5dc..200e5f6ae 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -71,10 +71,10 @@ class ModerationContainer extends Component { const id = getAssetId(this.props); const tab = getTab(this.props); - // Grab premod from asset or from settings - const premod = !id ? settings.moderation : asset.settings.moderation; + // Grab premod from asset or from settings if it's defined. + const setting = id && asset && asset.settings ? asset.settings.moderation : settings.moderation; - const queue = isPremod(premod) ? 'premod' : 'new'; + const queue = isPremod(setting) ? 'premod' : 'new'; const activeTab = tab ? tab : queue; return activeTab;