API & Client - fix user detail display when user is not an admin

SamR1 · Sep 29, 2024 · f7587a6 · f7587a6
1 parent e9ae49f
commit f7587a6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/fittrackee/tests/users/test_users_model.py b/fittrackee/tests/users/test_users_model.py
@@ -1363,6 +1363,7 @@ def test_it_returns_limited_user_infos_as_user(
             'is_followed_by': user_2.is_followed_by(user_1),
             'nb_workouts': user_2.workouts_count,
             'picture': user_2.picture is not None,
+            'suspended_at': user_2.suspended_at,
             'username': user_2.username,
         }
 
@@ -1378,5 +1379,6 @@ def test_it_returns_limited_user_infos_as_unauthenticated_user(
             'following': user_2.following.count(),
             'nb_workouts': user_2.workouts_count,
             'picture': user_2.picture is not None,
+            'suspended_at': user_2.suspended_at,
             'username': user_2.username,
         }
diff --git a/fittrackee/users/models.py b/fittrackee/users/models.py
@@ -597,10 +597,10 @@ def serialize(
             'following': self.following.count(),
             'nb_workouts': self.workouts_count,
             'picture': self.picture is not None,
+            'suspended_at': self.suspended_at,
             'username': self.username,
         }
         if role in [UserRole.AUTH_USER, UserRole.ADMIN]:
-            serialized_user['suspended_at'] = self.suspended_at
             serialized_user['is_active'] = self.is_active
         if role == UserRole.ADMIN:
             serialized_user['email'] = self.email

diff --git a/fittrackee_client/src/components/User/ProfileDisplay/UserHeader.vue b/fittrackee_client/src/components/User/ProfileDisplay/UserHeader.vue
@@ -13,7 +13,7 @@
     <AlertMessage
       message="user.ACCOUNT_SUSPENDED_AT"
       :param="suspensionDate"
-      v-if="user.suspended_at !== null"
+      v-if="'suspended_at' in user && user.suspended_at !== null"
     >
       <template #additionalMessage v-if="displayMakeAppeal">
         <router-link to="/profile/suspension" class="appeal-link">

diff --git a/fittrackee_client/src/components/User/ProfileDisplay/UserInfos.vue b/fittrackee_client/src/components/User/ProfileDisplay/UserInfos.vue
@@ -30,7 +30,7 @@
     </div>
     <AlertMessage
       message="user.THIS_USER_ACCOUNT_IS_INACTIVE"
-      v-if="!user.is_active"
+      v-if="authUser?.admin && !user.is_active"
     />
     <ErrorMessage
       :message="errorMessages"