diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-05 20:58:09 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-05 21:04:22 +0100 |
| commit | 0af3401553bfc8366779bf64ebe257c962eb82eb (patch) | |
| tree | 8a58782e808655729a789ca0da66bcd52bd2d76a /app/assets | |
| parent | eee8afb0b711205b793cb881ad6e875305d6d45e (diff) | |
Don't allow people to follow people they blocked without unblocking first
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/components/features/account/components/header.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/features/account/components/header.jsx b/app/assets/javascripts/components/features/account/components/header.jsx index dead11265..30e0449c5 100644 --- a/app/assets/javascripts/components/features/account/components/header.jsx +++ b/app/assets/javascripts/components/features/account/components/header.jsx @@ -44,7 +44,7 @@ const Header = React.createClass({ <IconButton size={26} disabled={true} icon='hourglass' title={intl.formatMessage(messages.requested)} /> </div> ); - } else { + } else if (!account.getIn(['relationship', 'blocking'])) { actionBtn = ( <div style={{ position: 'absolute', top: '10px', left: '20px' }}> <IconButton size={26} icon={account.getIn(['relationship', 'following']) ? 'user-times' : 'user-plus'} active={account.getIn(['relationship', 'following'])} title={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={this.props.onFollow} /> |