Merge branch 'master' into i18n-refactor

2026-08-12 12:30:39 +08:00 · 2017-05-19 12:44:34 -07:00
parent 9be443eda8 f32208b35b
commit 625362d51e
73 changed files with 1430 additions and 304 deletions
@@ -16,6 +16,7 @@ class ModerationQueue extends React.Component {
    suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired,
    currentAsset: PropTypes.object,
    showBanUserDialog: PropTypes.func.isRequired,
+    showSuspendUserDialog: PropTypes.func.isRequired,
    rejectComment: PropTypes.func.isRequired,
    acceptComment: PropTypes.func.isRequired,
    comments: PropTypes.array.isRequired
@@ -62,9 +63,11 @@ class ModerationQueue extends React.Component {
                viewUserDetail={viewUserDetail}
                actions={actionsMap[status]}
                showBanUserDialog={props.showBanUserDialog}
+                showSuspendUserDialog={props.showSuspendUserDialog}
                acceptComment={props.acceptComment}
                rejectComment={props.rejectComment}
                currentAsset={props.currentAsset}
+                currentUserId={this.props.currentUserId}
                />;
            })
            : <EmptyCard>{t('modqueue.empty_queue')}</EmptyCard>