diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-12-28 11:43:24 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-12-28 11:43:24 +0000 |
| commit | d22e04eaf6221f89d621db2ca839d3f30fb259dc (patch) | |
| tree | b3dd4e27cbc7403b8395c706e1e21f8a630c1aa8 /src/components | |
| parent | a20f1794d0d63497f701d8db91b1b0691fd06d54 (diff) | |
| parent | 4587f37dd72cfbb75e0fb008237ee3fe430caed1 (diff) | |
Merge branch 'allow_to_cancel_follow_request' into 'develop'
Allow canceling a follow request
See merge request pleroma/pleroma-fe!1416
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/follow_button/follow_button.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/follow_button/follow_button.js b/src/components/follow_button/follow_button.js index 95e7cb6b..df42692b 100644 --- a/src/components/follow_button/follow_button.js +++ b/src/components/follow_button/follow_button.js @@ -14,7 +14,7 @@ export default { if (this.inProgress || this.relationship.following) { return this.$t('user_card.follow_unfollow') } else if (this.relationship.requested) { - return this.$t('user_card.follow_again') + return this.$t('user_card.follow_cancel') } else { return this.$t('user_card.follow') } @@ -33,7 +33,7 @@ export default { }, methods: { onClick () { - this.relationship.following ? this.unfollow() : this.follow() + this.relationship.following || this.relationship.requested ? this.unfollow() : this.follow() }, follow () { this.inProgress = true |