commit: ff60a9e6316f76a6a4a055de141e53ecb7d1f9cd
parent: fdd8cb619a50eb4bf6d7ead3262c3567206c7a54
Author: lambda <pleromagit@rogerbraun.net>
Date: Fri, 30 Nov 2018 19:51:50 +0000
Merge branch 'fix/user-search-profile-link' into 'develop'
Fix user search profile link
See merge request pleroma/pleroma-fe!382
Diffstat:
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
@@ -19,7 +19,9 @@
{{ $t('user_card.follows_you') }}
</span>
</div>
- <a :href="user.statusnet_profile_url" target="blank"><div class="user-screen-name">@{{ user.screen_name }}</div></a>
+ <router-link class='user-screen-name' :to="{ name: 'user-profile', params: { id: user.id } }">
+ @{{user.screen_name}}
+ </router-link>
</div>
<div class="approval" v-if="showApproval">
<button class="btn btn-default" @click="approveUser">{{ $t('user_card.approve') }}</button>
diff --git a/src/components/user_search/user_search.vue b/src/components/user_search/user_search.vue
@@ -1,5 +1,5 @@
<template>
- <div class="user-seach panel panel-default">
+ <div class="user-search panel panel-default">
<div class="panel-heading">
{{$t('nav.user_search')}}
</div>