sam/admin-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use logical AND not bitwise AND

Browse source
This commit is contained in:
Mark Felder 2021-01-18 12:34:17 -06:00
parent 3df5aebadf
commit d46869a1c9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/views/users/index.vue
View file

@ -56,11 +56,11 @@
</el-table-column>
<el-table-column :min-width="width" :label="$t('users.status')">
<template slot-scope="scope">
<el-tag v-if="!scope.row.deactivated & scope.row.is_approved" type="success">
<el-tag v-if="!scope.row.deactivated && scope.row.is_approved" type="success">
<span v-if="isDesktop">{{ $t('users.active') }}</span>
<i v-else class="el-icon-circle-check"/>
</el-tag>
<el-tag v-if="scope.row.deactivated & scope.row.is_approved" type="danger">
<el-tag v-if="scope.row.deactivated && scope.row.is_approved" type="danger">
<span v-if="isDesktop">{{ $t('users.deactivated') }}</span>
<i v-else class="el-icon-circle-close"/>
</el-tag>

2
src/views/users/show.vue
View file

@ -90,7 +90,7 @@
<td>{{ $t('userProfile.status') }}</td>
<td>
<el-tag v-if="!user.is_approved" type="info">{{ $t('userProfile.pending') }}</el-tag>
<el-tag v-if="!user.deactivated & user.is_approved" type="success">{{ $t('userProfile.active') }}</el-tag>
<el-tag v-if="!user.deactivated && user.is_approved" type="success">{{ $t('userProfile.active') }}</el-tag>
<el-tag v-if="user.deactivated" type="danger">{{ $t('userProfile.deactivated') }}</el-tag>
</td>
</tr>