diff options
| author | Henry Jameson <me@hjkos.com> | 2019-01-09 14:18:36 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-01-09 14:18:36 +0300 |
| commit | 0b8f616af10f4fcb4697b5540f0ad5188056728c (patch) | |
| tree | 7ff81a9004439545ae109e0710204ac57c14f961 /src | |
| parent | 1fb9ceb59bf0dca5f755f5988f90bdd24a89dd53 (diff) | |
fix #262 part of user profiles not being able to load previous posts
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/user_profile/user_profile.js | 6 | ||||
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js index 2ca09817..bde20707 100644 --- a/src/components/user_profile/user_profile.js +++ b/src/components/user_profile/user_profile.js @@ -21,7 +21,7 @@ const UserProfile = { return this.$route.params.id || this.user.id }, userName () { - return this.$route.params.name + return this.$route.params.name || this.user.screen_name }, friends () { return this.user.friends @@ -68,7 +68,7 @@ const UserProfile = { } this.$store.dispatch('stopFetching', 'user') this.$store.commit('clearTimeline', { timeline: 'user' }) - this.$store.dispatch('startFetching', ['user', this.userName]) + this.$store.dispatch('startFetching', ['user', this.fetchBy]) }, userId () { if (!this.isExternal) { @@ -76,7 +76,7 @@ const UserProfile = { } this.$store.dispatch('stopFetching', 'user') this.$store.commit('clearTimeline', { timeline: 'user' }) - this.$store.dispatch('startFetching', ['user', this.userId]) + this.$store.dispatch('startFetching', ['user', this.fetchBy]) }, user () { if (this.user.id && !this.user.followers) { diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index a46befa5..50619026 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -3,7 +3,7 @@ <div v-if="user.id" class="user-profile panel panel-default"> <user-card-content :user="user" :switcher="true" :selected="timeline.viewing"></user-card-content> <tab-switcher> - <Timeline :label="$t('user_card.statuses')" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/> + <Timeline :label="$t('user_card.statuses')" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="fetchBy"/> <div :label="$t('user_card.followees')"> <div v-if="friends"> <user-card v-for="friend in friends" :key="friend.id" :user="friend" :showFollows="true"></user-card> |