sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fix/user-search-profile-link' into 'develop' 

Fix user search profile link

See merge request pleroma/pleroma-fe!382
This commit is contained in:
lambda 2018-11-30 19:51:50 +00:00
parent fdd8cb619a bee6a0273b
commit ff60a9e631
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/user_card/user_card.vue
View File

@ -19,7 +19,9 @@
{{ $t('user_card.follows_you') }} {{ $t('user_card.follows_you') }}
</span> </span>
</div> </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>
<div class="approval" v-if="showApproval"> <div class="approval" v-if="showApproval">
<button class="btn btn-default" @click="approveUser">{{ $t('user_card.approve') }}</button> <button class="btn btn-default" @click="approveUser">{{ $t('user_card.approve') }}</button>

2
src/components/user_search/user_search.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="user-seach panel panel-default"> <div class="user-search panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
{{$t('nav.user_search')}} {{$t('nav.user_search')}}
</div> </div>