Merge branch '287-following-followers-tabs' into 'develop'

Hide Following/Followers tabs if user has them disabled

Closes #287

See merge request pleroma/pleroma-fe!515
This commit is contained in:
Shpuld Shpludson 2019-02-07 15:59:37 +00:00
commit 9b49fa3c0c
2 changed files with 8 additions and 2 deletions

View file

@ -58,6 +58,12 @@ const UserProfile = {
}, },
isExternal () { isExternal () {
return this.$route.name === 'external-user-profile' return this.$route.name === 'external-user-profile'
},
followsTabVisible () {
return this.isUs || !this.user.hide_follows
},
followersTabVisible () {
return this.isUs || !this.user.hide_followers
} }
}, },
methods: { methods: {

View file

@ -15,13 +15,13 @@
:timeline-name="'user'" :timeline-name="'user'"
:user-id="fetchBy" :user-id="fetchBy"
/> />
<div :label="$t('user_card.followees')"> <div :label="$t('user_card.followees')" v-if="followsTabVisible">
<FollowList v-if="user.friends_count > 0" :userId="userId" :showFollowers="false" /> <FollowList v-if="user.friends_count > 0" :userId="userId" :showFollowers="false" />
<div class="userlist-placeholder" v-else> <div class="userlist-placeholder" v-else>
<i class="icon-spin3 animate-spin"></i> <i class="icon-spin3 animate-spin"></i>
</div> </div>
</div> </div>
<div :label="$t('user_card.followers')"> <div :label="$t('user_card.followers')" v-if="followersTabVisible">
<FollowList v-if="user.followers_count > 0" :userId="userId" :showFollowers="true" /> <FollowList v-if="user.followers_count > 0" :userId="userId" :showFollowers="true" />
<div class="userlist-placeholder" v-else> <div class="userlist-placeholder" v-else>
<i class="icon-spin3 animate-spin"></i> <i class="icon-spin3 animate-spin"></i>