Merge pull request #1501 from bcgov/fix/EDX-1618

EDX-1618 - Checks for adminUsers on all users instead of filteredUsers
bcgov · Jul 13, 2023 · 3106b57 · 3106b57
2 parents 015aed0 + 3cf3472
commit 3106b57
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/frontend/src/components/secure-message/AccessDistrictUsersPage.vue b/frontend/src/components/secure-message/AccessDistrictUsersPage.vue
@@ -335,7 +335,7 @@ export default {
   computed: {
     ...mapState(edxStore, ['districtRoles', 'districtRolesCopy']),
     hasAdminUsers() {
-      return this.filteredUsers.filter(user => {
+      return this.users.filter(user => {
         return user.edxUserDistricts.some(district => district.edxUserDistrictRoles.some(role => role.edxRoleCode === ROLE.EDX_DISTRICT_ADMIN));
       })?.length > 0;
     }

diff --git a/frontend/src/components/secure-message/AccessSchoolUsersPage.vue b/frontend/src/components/secure-message/AccessSchoolUsersPage.vue
@@ -313,7 +313,7 @@ export default {
     ...mapState(appStore, ['schoolMap']),
     ...mapState(edxStore, ['schoolRoles','schoolRolesCopy']),
     hasAdminUsers() {
-      return this.filteredUsers.filter(user => {
+      return this.users.filter(user => {
         return user.edxUserSchools.some(school => school.edxUserSchoolRoles.some(role => role.edxRoleCode === ROLE.EDX_SCHOOL_ADMIN));
       })?.length > 0;
     }