mirror of
https://github.com/ascribe/onion.git
synced 2024-06-30 13:41:57 +02:00
fix currentUser bug
This commit is contained in:
parent
9bfd50e3bc
commit
9d67d046d0
|
@ -104,7 +104,7 @@ let AccountSettings = React.createClass({
|
||||||
show={true}
|
show={true}
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
{content}
|
{content}
|
||||||
<CopyrightAssociationForm currentUser={this.state.currentUser}/>
|
<CopyrightAssociationForm currentUser={this.props.currentUser}/>
|
||||||
{profile}
|
{profile}
|
||||||
{/*<Form
|
{/*<Form
|
||||||
url={AppConstants.serverUrl + 'api/users/set_language/'}>
|
url={AppConstants.serverUrl + 'api/users/set_language/'}>
|
||||||
|
|
|
@ -43,15 +43,18 @@ let SettingsContainer = React.createClass({
|
||||||
},
|
},
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
if (this.state.currentUser && this.state.currentUser.username) {
|
||||||
<div className="settings-container">
|
return (
|
||||||
<AccountSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/>
|
<div className="settings-container">
|
||||||
{this.props.children}
|
<AccountSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/>
|
||||||
<APISettings />
|
{this.props.children}
|
||||||
<BitcoinWalletSettings />
|
<APISettings />
|
||||||
<ContractSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/>
|
<BitcoinWalletSettings />
|
||||||
</div>
|
<ContractSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/>
|
||||||
);
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user