logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 86b3cb512052b8969e2f259dd784569738efe33f
parent: f21e7d6ac06556671c2663ce2879442c60230b32
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon, 30 Jan 2017 22:35:36 +0100

Fix not reloading account/fetching relationship on newly independent components

Diffstat:

Mapp/assets/javascripts/components/features/account_timeline/index.jsx3+++
Mapp/assets/javascripts/components/features/followers/index.jsx3+++
Mapp/assets/javascripts/components/features/following/index.jsx3+++
3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/app/assets/javascripts/components/features/account_timeline/index.jsx b/app/assets/javascripts/components/features/account_timeline/index.jsx @@ -2,6 +2,7 @@ import { connect } from 'react-redux'; import PureRenderMixin from 'react-addons-pure-render-mixin'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { + fetchAccount, fetchAccountTimeline, expandAccountTimeline } from '../../actions/accounts'; @@ -30,11 +31,13 @@ const AccountTimeline = React.createClass({ mixins: [PureRenderMixin], componentWillMount () { + this.props.dispatch(fetchAccount(Number(this.props.params.accountId))); this.props.dispatch(fetchAccountTimeline(Number(this.props.params.accountId))); }, componentWillReceiveProps(nextProps) { if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) { + this.props.dispatch(fetchAccount(Number(nextProps.params.accountId))); this.props.dispatch(fetchAccountTimeline(Number(nextProps.params.accountId))); } }, diff --git a/app/assets/javascripts/components/features/followers/index.jsx b/app/assets/javascripts/components/features/followers/index.jsx @@ -3,6 +3,7 @@ import PureRenderMixin from 'react-addons-pure-render-mixin'; import ImmutablePropTypes from 'react-immutable-proptypes'; import LoadingIndicator from '../../components/loading_indicator'; import { + fetchAccount, fetchFollowers, expandFollowers } from '../../actions/accounts'; @@ -28,11 +29,13 @@ const Followers = React.createClass({ mixins: [PureRenderMixin], componentWillMount () { + this.props.dispatch(fetchAccount(Number(this.props.params.accountId))); this.props.dispatch(fetchFollowers(Number(this.props.params.accountId))); }, componentWillReceiveProps(nextProps) { if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) { + this.props.dispatch(fetchAccount(Number(nextProps.params.accountId))); this.props.dispatch(fetchFollowers(Number(nextProps.params.accountId))); } }, diff --git a/app/assets/javascripts/components/features/following/index.jsx b/app/assets/javascripts/components/features/following/index.jsx @@ -3,6 +3,7 @@ import PureRenderMixin from 'react-addons-pure-render-mixin'; import ImmutablePropTypes from 'react-immutable-proptypes'; import LoadingIndicator from '../../components/loading_indicator'; import { + fetchAccount, fetchFollowing, expandFollowing } from '../../actions/accounts'; @@ -28,11 +29,13 @@ const Following = React.createClass({ mixins: [PureRenderMixin], componentWillMount () { + this.props.dispatch(fetchAccount(Number(this.props.params.accountId))); this.props.dispatch(fetchFollowing(Number(this.props.params.accountId))); }, componentWillReceiveProps(nextProps) { if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) { + this.props.dispatch(fetchAccount(Number(nextProps.params.accountId))); this.props.dispatch(fetchFollowing(Number(nextProps.params.accountId))); } },