diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-09-12 07:02:11 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-09-12 07:02:11 +0000 |
| commit | 4a469d7fe3a951e63742b63f18f45e96500ec9e3 (patch) | |
| tree | fc34cea1cbf08930bcf0bf684f418cb7acea1ed9 /src/components/user_card/user_card.vue | |
| parent | 2bb053dd71ddfff5451ff43356cbad5cb4c5c5a6 (diff) | |
| parent | 424d4ab57e13a8a271a16e063ce70af98759f8f9 (diff) | |
Merge branch 'fix/follow-request-detection' into 'develop'
Utilize `user.requested` to display follow request status on user card
Closes #635
See merge request pleroma/pleroma-fe!942
Diffstat (limited to 'src/components/user_card/user_card.vue')
| -rw-r--r-- | src/components/user_card/user_card.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index fc18e240..0b83cf16 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -135,13 +135,13 @@ <button class="btn btn-default btn-block" :disabled="followRequestInProgress" - :title="followRequestSent ? $t('user_card.follow_again') : ''" + :title="user.requested ? $t('user_card.follow_again') : ''" @click="followUser" > <template v-if="followRequestInProgress"> {{ $t('user_card.follow_progress') }} </template> - <template v-else-if="followRequestSent"> + <template v-else-if="user.requested"> {{ $t('user_card.follow_sent') }} </template> <template v-else> |