summaryrefslogtreecommitdiffstats
path: root/webapp/components/backstage
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-12-05 10:19:12 -0300
committerHarrison Healey <harrisonmhealey@gmail.com>2016-12-05 08:19:12 -0500
commit145876681f03f68d2fcdd4f0339f6b2b9f7b9958 (patch)
treea1d46412813338d5e9453e3fc515dd52188cef91 /webapp/components/backstage
parent05783664cd91e278913db5504e60bb8bc2992cb6 (diff)
downloadchat-145876681f03f68d2fcdd4f0339f6b2b9f7b9958.tar.gz
chat-145876681f03f68d2fcdd4f0339f6b2b9f7b9958.tar.bz2
chat-145876681f03f68d2fcdd4f0339f6b2b9f7b9958.zip
Fix react warnings and part of backstage (#4706)
Diffstat (limited to 'webapp/components/backstage')
-rw-r--r--webapp/components/backstage/backstage_controller.jsx9
-rw-r--r--webapp/components/backstage/components/backstage_section.jsx1
2 files changed, 5 insertions, 5 deletions
diff --git a/webapp/components/backstage/backstage_controller.jsx b/webapp/components/backstage/backstage_controller.jsx
index 4890dfddb..9e842e1f7 100644
--- a/webapp/components/backstage/backstage_controller.jsx
+++ b/webapp/components/backstage/backstage_controller.jsx
@@ -4,6 +4,7 @@
import React from 'react';
import TeamStore from 'stores/team_store.jsx';
+import UserStore from 'stores/user_store.jsx';
import BackstageSidebar from './components/backstage_sidebar.jsx';
import BackstageNavbar from './components/backstage_navbar.jsx';
@@ -13,8 +14,7 @@ export default class BackstageController extends React.Component {
static get propTypes() {
return {
children: React.PropTypes.node.isRequired,
- params: React.PropTypes.object.isRequired,
- user: React.PropTypes.object.isRequired
+ params: React.PropTypes.object.isRequired
};
}
@@ -24,6 +24,7 @@ export default class BackstageController extends React.Component {
this.onTeamChange = this.onTeamChange.bind(this);
this.state = {
+ user: UserStore.getCurrentUser(),
team: props.params.team ? TeamStore.getByName(props.params.team) : TeamStore.getCurrent()
};
}
@@ -50,7 +51,7 @@ export default class BackstageController extends React.Component {
<div className='backstage-body'>
<BackstageSidebar
team={this.state.team}
- user={this.props.user}
+ user={this.state.user}
/>
{
React.Children.map(this.props.children, (child) => {
@@ -60,7 +61,7 @@ export default class BackstageController extends React.Component {
return React.cloneElement(child, {
team: this.state.team,
- user: this.props.user
+ user: this.state.user
});
})
}
diff --git a/webapp/components/backstage/components/backstage_section.jsx b/webapp/components/backstage/components/backstage_section.jsx
index c8b63af18..e89ec9861 100644
--- a/webapp/components/backstage/components/backstage_section.jsx
+++ b/webapp/components/backstage/components/backstage_section.jsx
@@ -65,7 +65,6 @@ export default class BackstageSection extends React.Component {
<Link
className={`${className}-title`}
activeClassName={`${className}-title--active`}
- onClick={this.handleClick}
to={link}
>
<span className={`${className}-title__text`}>