diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-10-08 19:06:57 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-10-08 19:06:57 +0000 |
| commit | 7d3330b7b673f5071987cf1e996695aea026f158 (patch) | |
| tree | 06b550ee80566010d85805bedbe2113dfcad3b32 /src | |
| parent | 122323f35c32a4f12a345a8b3f163e9318f5dea3 (diff) | |
| parent | 78e8a49f40f71d557d4b7c7bf31cb74fb7a3b6d8 (diff) | |
Merge branch 'issue/679' into 'develop'
[#679] fix follow request on search page
See merge request pleroma/pleroma-fe!970
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/follow_card/follow_card.js | 6 | ||||
| -rw-r--r-- | src/components/follow_card/follow_card.vue | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/components/follow_card/follow_card.js b/src/components/follow_card/follow_card.js index dc4a0d41..118d0c7c 100644 --- a/src/components/follow_card/follow_card.js +++ b/src/components/follow_card/follow_card.js @@ -9,8 +9,7 @@ const FollowCard = { ], data () { return { - inProgress: false, - requestSent: false + inProgress: false } }, components: { @@ -28,9 +27,8 @@ const FollowCard = { methods: { followUser () { this.inProgress = true - requestFollow(this.user, this.$store).then(({ sent }) => { + requestFollow(this.user, this.$store).then(() => { this.inProgress = false - this.requestSent = sent }) }, unfollowUser () { diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue index 310fe843..a9d237bb 100644 --- a/src/components/follow_card/follow_card.vue +++ b/src/components/follow_card/follow_card.vue @@ -20,13 +20,13 @@ v-if="!user.following" class="btn btn-default follow-card-follow-button" :disabled="inProgress" - :title="requestSent ? $t('user_card.follow_again') : ''" + :title="user.requested ? $t('user_card.follow_again') : ''" @click="followUser" > <template v-if="inProgress"> {{ $t('user_card.follow_progress') }} </template> - <template v-else-if="requestSent"> + <template v-else-if="user.requested"> {{ $t('user_card.follow_sent') }} </template> <template v-else> |