wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-01 23:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bump-version-3-8-0

Browse Source
This commit is contained in:
Wyatt Johnson
2017-11-09 15:10:24 -07:00
committed by GitHub
parent 6d5adc8f54 44d6ad340d
commit 51977dcf54
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/routes/Moderation/containers/Moderation.js
+3 -3
View File
@@ -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;