diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-19 14:47:32 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-19 14:47:32 +0000 |
| commit | ed3c318be0a70399980b7417cc8eec32d45ca006 (patch) | |
| tree | c8ba2cd512497f76bd0f2775f2e96b2963219f86 /src/components/user_card/user_card.js | |
| parent | 962a33f887786dfdd2df57be66cd37b8ddb7d06d (diff) | |
| parent | e801d78e9d923df1263eb9dc78db8fdfa8637734 (diff) | |
Merge branch 'edijs/pleroma-fe-fix/followers-ui' into 'develop'
Fix followers/follows UI, fix #343 fix #340
Closes #340 and #343
See merge request pleroma/pleroma-fe!590
Diffstat (limited to 'src/components/user_card/user_card.js')
| -rw-r--r-- | src/components/user_card/user_card.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index a4c84716..28e22f09 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -6,9 +6,8 @@ import { requestFollow, requestUnfollow } from '../../services/follow_manipulate const UserCard = { props: [ 'user', - 'showFollows', - 'showApproval', - 'showActions' + 'noFollowsYou', + 'showApproval' ], data () { return { @@ -26,7 +25,7 @@ const UserCard = { currentUser () { return this.$store.state.users.currentUser }, following () { return this.updated ? this.updated.following : this.user.following }, showFollow () { - return this.showActions && (!this.showFollows && !this.following || this.updated && !this.updated.following) + return !this.showApproval && (!this.following || this.updated && !this.updated.following) } }, methods: { |