ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-30 13:41:57 +02:00
Code Issues Releases Wiki Activity

fix currentUser bug

Browse Source
This commit is contained in:
diminator 2015-09-21 10:32:35 +02:00
parent 9bfd50e3bc
commit 9d67d046d0
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_settings/account_settings.js
View File

@ -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/'}>

3
js/components/ascribe_settings/settings_container.js
View File

@ -43,6 +43,7 @@ let SettingsContainer = React.createClass({
}, },
render() { render() {
if (this.state.currentUser && this.state.currentUser.username) {
return ( return (
<div className="settings-container"> <div className="settings-container">
<AccountSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/> <AccountSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/>
@ -53,6 +54,8 @@ let SettingsContainer = React.createClass({
</div> </div>
); );
} }
return null;
}
}); });
export default SettingsContainer; export default SettingsContainer;