summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-05-10 12:30:55 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-05-16 17:40:10 -0400
commit1fcca626ca642d0855ea286719a909a6fb48348e (patch)
tree4ecb86c35560383300dda4ff1ab720708891a934 /packages
parentfix prop type for MKRolePreview (diff)
downloadsharkey-1fcca626ca642d0855ea286719a909a6fb48348e.tar.gz
sharkey-1fcca626ca642d0855ea286719a909a6fb48348e.tar.bz2
sharkey-1fcca626ca642d0855ea286719a909a6fb48348e.zip
fix error when expanding conditional role
Diffstat (limited to 'packages')
-rw-r--r--packages/frontend/src/pages/admin-user.vue11
1 files changed, 8 insertions, 3 deletions
diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index bab40a90bd..859e24d9f3 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -170,9 +170,14 @@ SPDX-License-Identifier: AGPL-3.0-only
<button v-else class="_button" :class="$style.roleUnassign" disabled><i class="ti ti-ban"></i></button>
</div>
<div v-if="expandedRoles.includes(role.id)" :class="$style.roleItemSub">
- <div>Assigned: <MkTime :time="info.roleAssigns.find(a => a.roleId === role.id).createdAt" mode="detail"/></div>
- <div v-if="info.roleAssigns.find(a => a.roleId === role.id).expiresAt">Period: {{ new Date(info.roleAssigns.find(a => a.roleId === role.id).expiresAt).toLocaleString() }}</div>
- <div v-else>Period: {{ i18n.ts.indefinitely }}</div>
+ <template v-if="info.roleAssigns.some(a => a.roleId === role.id)">
+ <div>{{ i18n.ts.roleAssigned }}: <MkTime :time="info.roleAssigns.find(a => a.roleId === role.id).createdAt" mode="detail"/></div>
+ <div v-if="info.roleAssigns.find(a => a.roleId === role.id).expiresAt">{{ i18n.ts.rolePeriod }}: {{ new Date(info.roleAssigns.find(a => a.roleId === role.id).expiresAt).toLocaleString() }}</div>
+ <div v-else>{{ i18n.ts.rolePeriod }}: {{ i18n.ts.indefinitely }}</div>
+ </template>
+ <template v-else>
+ <div>{{ i18n.ts.roleAssigned }}: {{ i18n.ts.roleAutomatic }}</div>
+ </template>
</div>
</div>
</div>