From d46869a1c9688d70c45c7838deec956eac26cc2d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 18 Jan 2021 12:34:17 -0600
Subject: [PATCH] Use logical AND not bitwise AND

---
 src/views/users/index.vue | 4 ++--
 src/views/users/show.vue  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/users/index.vue b/src/views/users/index.vue
index 14270e10..7ca938d7 100644
--- a/src/views/users/index.vue
+++ b/src/views/users/index.vue
@@ -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>
diff --git a/src/views/users/show.vue b/src/views/users/show.vue
index cbe434a2..502b86df 100644
--- a/src/views/users/show.vue
+++ b/src/views/users/show.vue
@@ -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>