summaryrefslogtreecommitdiff
path: root/src/client/app/admin
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2018-12-07 11:29:49 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-12-07 11:29:49 +0900
commit93b599dc8ea6f723d95b89a90c0d354bccd95ea1 (patch)
treebae66b89b62ab754f40800b868f3703848eab927 /src/client/app/admin
parentUpdate README.md [AUTOGEN] (#3527) (diff)
downloadsharkey-93b599dc8ea6f723d95b89a90c0d354bccd95ea1.tar.gz
sharkey-93b599dc8ea6f723d95b89a90c0d354bccd95ea1.tar.bz2
sharkey-93b599dc8ea6f723d95b89a90c0d354bccd95ea1.zip
Add user name conversions (#3534)
* Add user name conversions * add conversion
Diffstat (limited to 'src/client/app/admin')
-rw-r--r--src/client/app/admin/views/index.vue2
-rw-r--r--src/client/app/admin/views/users.vue2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/app/admin/views/index.vue b/src/client/app/admin/views/index.vue
index 3cd8ee7a2a..3da13ad214 100644
--- a/src/client/app/admin/views/index.vue
+++ b/src/client/app/admin/views/index.vue
@@ -15,7 +15,7 @@
</div>
<div class="me">
<img class="avatar" :src="$store.state.i.avatarUrl" alt="avatar"/>
- <p class="name">{{ $store.state.i | userName }}</p>
+ <p class="name"><mk-user-name :user="$store.state.i"/></p>
</div>
<ul>
<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</li>
diff --git a/src/client/app/admin/views/users.vue b/src/client/app/admin/views/users.vue
index ac2991c519..e50e33bf52 100644
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@@ -46,7 +46,7 @@
</div>
<div>
<header>
- <b>{{ user | userName }}</b>
+ <b><mk-user-name :user="user"/></b>
<span class="username">@{{ user | acct }}</span>
</header>
<div>