Take over branch and fix some issues
This commit is contained in:
parent
5d0e51cae3
commit
e801d78e9d
5 changed files with 81 additions and 64 deletions
|
@ -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: {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue