From 8977948b4077054ac7709d1685632d11360b8584 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Dec 06 2017 04:30:37 +0000 Subject: Remove some options from user config dialog * remove the avatar option in userhub config #470 * remove hub visibility option from userhub config #484 * remove user management tabs from userhubs config #483 * comment out the other tab that said it wasnt implemented #485 Signed-off-by: Ryan Lerch --- diff --git a/hubs/static/client/app/components/HubConfig/HubConfigDialog.js b/hubs/static/client/app/components/HubConfig/HubConfigDialog.js index 6d00e05..3f42ed6 100644 --- a/hubs/static/client/app/components/HubConfig/HubConfigDialog.js +++ b/hubs/static/client/app/components/HubConfig/HubConfigDialog.js @@ -93,34 +93,41 @@ export default class HubConfigDialog extends React.Component { globalConfig={this.props.globalConfig} tabTitle={} handleChange={this.props.onConfigChange} + hub={this.props.hub} /> - } - urls={this.props.urls} - currentUser={this.props.currentUser} - /> - } - urls={this.props.urls} - currentUser={this.props.currentUser} - /> - } - handleChange={this.props.onConfigChange} - /> - } + urls={this.props.urls} + currentUser={this.props.currentUser} + /> + } + {!this.props.hub.user_hub && + } + urls={this.props.urls} + currentUser={this.props.currentUser} + /> + } + {!this.props.hub.user_hub && + } + handleChange={this.props.onConfigChange} + /> + } + {/*} - /> + />*/} ); diff --git a/hubs/static/client/app/components/HubConfig/HubConfigPanelGeneral.js b/hubs/static/client/app/components/HubConfig/HubConfigPanelGeneral.js index 00b1e44..cce20a5 100644 --- a/hubs/static/client/app/components/HubConfig/HubConfigPanelGeneral.js +++ b/hubs/static/client/app/components/HubConfig/HubConfigPanelGeneral.js @@ -100,6 +100,7 @@ export default class GeneralPanel extends React.Component { />

+ {!this.props.hub.user_hub &&
+ } + {!this.props.hub.user_hub &&
+ } ); } diff --git a/hubs/static/client/app/components/HubConfig/index.js b/hubs/static/client/app/components/HubConfig/index.js index 8446004..4a4062b 100644 --- a/hubs/static/client/app/components/HubConfig/index.js +++ b/hubs/static/client/app/components/HubConfig/index.js @@ -101,6 +101,7 @@ class HubConfig extends React.Component { onUserChange={this.doUserChange} urls={this.props.urls} currentUser={this.props.currentUser} + hub={this.props.hub} /> } diff --git a/hubs/static/client/app/components/TabSet.js b/hubs/static/client/app/components/TabSet.js index 25dad18..b601b93 100644 --- a/hubs/static/client/app/components/TabSet.js +++ b/hubs/static/client/app/components/TabSet.js @@ -20,6 +20,7 @@ export default class TabSet extends React.Component { render() { var tabLinks = this.props.children.map(function(panel, index) { + if (!panel){return null;} return ( this.linkClicked(e, index)} @@ -30,6 +31,7 @@ export default class TabSet extends React.Component { }.bind(this)); var tabPanels = this.props.children.map(function(panel, index) { + if (!panel){return null;} return (