Skip to content

Commit d6ccdd8

Browse files
Merge pull request #48 from Stcwal/fixed-users-plz
Add user homeLocationName to settings UI
2 parents 31f36fb + 40ab7d6 commit d6ccdd8

3 files changed

Lines changed: 4 additions & 0 deletions

File tree

frontend/src/services/organization.service.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ interface BackendUser {
3030
email: string
3131
role: UserRole
3232
isActive: boolean
33+
homeLocationName: string | null
3334
}
3435

3536
interface BackendOrg {
@@ -77,6 +78,7 @@ export const organizationService = {
7778
email: u.email,
7879
role: u.role,
7980
isActive: u.isActive,
81+
homeLocationName: u.homeLocationName ?? null,
8082
...ROLE_COLORS[u.role],
8183
permissions: ROLE_PERMISSIONS[u.role],
8284
}))

frontend/src/types/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ export interface SettingsUser {
229229
colorBg: string
230230
colorText: string
231231
permissions: UserPermissions
232+
homeLocationName: string | null
232233
}
233234

234235
// ============================================================

frontend/src/views/settings/UsersTab.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<div class="min-w-0">
2626
<div class="font-medium truncate">{{ user.firstName }} {{ user.lastName }}</div>
2727
<div class="text-muted text-sm truncate">{{ user.email }}</div>
28+
<div v-if="user.homeLocationName" class="text-muted text-sm truncate">{{ user.homeLocationName }}</div>
2829
</div>
2930
</div>
3031
<div class="flex items-center gap-3">

0 commit comments

Comments
 (0)