diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-07-28 21:05:22 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-07-28 21:05:22 +0000 |
| commit | 8aa3e7d52ea067c12dd12c711121fda190b5979d (patch) | |
| tree | 751002679ee4e672b3929b43b07fe61a06063ec7 /src/components/user_profile/user_profile.vue | |
| parent | 4827e4d972f8ee11e606693e24ae4ca21711c6b1 (diff) | |
| parent | 18a41e785ed85531f032a0aa1b6bfdce5a892fa9 (diff) | |
Merge branch '549' into 'develop'
Prevent showing pinned statuses twice
Closes #549
See merge request pleroma/pleroma-fe!812
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 4ea0a869..e862440e 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -15,25 +15,14 @@ :render-only-focused="true" > <div :label="$t('user_card.statuses')"> - <div class="timeline"> - <template v-for="statusId in user.pinnedStatuseIds"> - <Conversation - v-if="timeline.statusesObject[statusId]" - :key="statusId" - class="status-fadein" - :statusoid="timeline.statusesObject[statusId]" - :collapsable="true" - :show-pinned="true" - /> - </template> - </div> <Timeline :count="user.statuses_count" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" - :timeline-name="'user'" + timeline-name="user" :user-id="userId" + :pinned-status-ids="user.pinnedStatusIds" /> </div> <div |