Merge branch 'master' into develop

This commit is contained in:
Eliot Berriot 2019-06-28 09:38:55 +02:00
commit 17996ca936
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
9 changed files with 47 additions and 4 deletions

View file

@ -45,7 +45,8 @@
</template>
<template slot="row-cells" slot-scope="scope">
<td>
<router-link :to="{name: 'manage.moderation.accounts.detail', params: {id: scope.obj.full_username }}">{{ scope.obj.username }}</router-link>
<router-link v-if="scope.obj.actor" :to="{name: 'manage.moderation.accounts.detail', params: {id: scope.obj.actor.full_username }}">{{ scope.obj.username }}</router-link>
<router-link v-else :to="{name: 'manage.moderation.accounts.detail', params: {id: scope.obj.full_username }}">{{ scope.obj.username }}</router-link>
</td>
<td>
<span>{{ scope.obj.email }}</span>