Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1729fea

Browse filesBrowse files
mekanixmekanix
committed
Make it work with LDAP
1 parent b0d8ae6 commit 1729fea
Copy full SHA for 1729fea

File tree

Expand file treeCollapse file tree

7 files changed

+34
-20
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+34
-20
lines changed

‎src/lib/Role.svelte

Copy file name to clipboardExpand all lines: src/lib/Role.svelte
+17-7Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,31 @@
2525
})
2626
2727
const member = (user: any) => {
28-
const myusers = $detail.users.filter((u: any) => u.id === user.id)
28+
const users = $detail.users || $detail.uniqueMembers
29+
const myusers = users.filter((u: any) => {
30+
if (user.id) {
31+
return u.id === user.id
32+
}
33+
return u === user.dn
34+
})
2935
return myusers.length > 0
3036
}
3137
3238
const toggleMembership = (user: any) => async (event: any) => {
3339
let response
3440
if (event.target.checked) {
35-
response = await detail.assign($detail.id, user.id)
41+
response = await detail.assign($detail.id || $detail.dn, user.id || user.dn)
3642
} else {
37-
response = await detail.deassign($detail.id, user.id)
43+
response = await detail.deassign($detail.id || $detail.dn, user.id || user.dn)
3844
}
3945
if (!response.ok) {
4046
error(response.statusText)
4147
} else {
42-
$detail.users = [...$detail.users, user]
48+
if ($detail.users) {
49+
$detail.users = [...$detail.users, user]
50+
} else {
51+
$detail.uniqueMembers = [...$detail.uniqueMembers, user.dn]
52+
}
4353
}
4454
}
4555
@@ -62,7 +72,7 @@
6272
<Spinner size={200} />
6373
{:else}
6474
<div class="container">
65-
<h2>Role: {$detail.name}</h2>
75+
<h2>Role: {$detail.name || $detail.cn}</h2>
6676
<h3>Users</h3>
6777
<div class="table">
6878
<div class="heading">ID</div>
@@ -71,10 +81,10 @@
7181
<div class="heading">Admin</div>
7282
<div class="heading">Member</div>
7383
{#each $userList.data as user}
74-
<div class="data">{user.id}</div>
84+
<div class="data">{user.id || user.dn}</div>
7585
<div class="data">{user.email}</div>
7686
<div class="data">
77-
<input disabled type="checkbox" checked={user.active} />
87+
<input disabled type="checkbox" checked={user.active || user.userClass == 'enabled'} />
7888
</div>
7989
<div class="data">
8090
<input disabled type="checkbox" checked={user.admin} />

‎src/lib/Roles.svelte

Copy file name to clipboardExpand all lines: src/lib/Roles.svelte
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@
6666
<div class="heading">Name</div>
6767
{#each $list.data as role}
6868
<div class="data">
69-
<a href={`/roles/${role.id}`}>{role.id}</a>
69+
<a href={`/roles/${role.id || role.dn}`}>{role.id || role.dn}</a>
7070
</div>
7171
<div class="data">
72-
<a href={`/roles/${role.id}`}>{role.name}</a>
72+
<a href={`/roles/${role.id || role.dn}`}>{role.name || role.cn}</a>
7373
</div>
7474
<div class="border" />
7575
{/each}

‎src/lib/User.svelte

Copy file name to clipboardExpand all lines: src/lib/User.svelte
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
const toggleMembership = (role: any) => async (event: any) => {
3434
let response
3535
if (event.target.checked) {
36-
response = await roleDetail.assign(role.id, $detail.id)
36+
response = await roleDetail.assign(role.id || role.dn, $detail.id || $detail.dn)
3737
} else {
38-
response = await roleDetail.deassign(role.id, $detail.id)
38+
response = await roleDetail.deassign(role.id || role.dn, $detail.id || $detail.dn)
3939
}
4040
if (!response.ok) {
4141
error(response.statusText)
@@ -70,8 +70,8 @@
7070
<div class="heading">Name</div>
7171
<div class="heading">Member</div>
7272
{#each $roleList.data as role}
73-
<div class="data">{role.id}</div>
74-
<div class="data">{role.name}</div>
73+
<div class="data">{role.id || role.dn}</div>
74+
<div class="data">{role.name || role.cn}</div>
7575
<div class="data">
7676
<input
7777
type="checkbox"

‎src/lib/Users.svelte

Copy file name to clipboardExpand all lines: src/lib/Users.svelte
+7-3Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,16 @@
4040
<div class="heading">Active</div>
4141
<div class="heading">Admin</div>
4242
{#each $list.data as user}
43-
<div class="data">{user.id}</div>
43+
<div class="data">{user.id || user.dn}</div>
4444
<div class="data">
45-
<a href={`/users/${user.id}`}>{user.email}</a>
45+
<a href={`/users/${user.id || user.dn}`}>{user.email}</a>
4646
</div>
4747
<div class="data">
48-
<input disabled type="checkbox" checked={user.active} />
48+
<input
49+
disabled
50+
type="checkbox"
51+
checked={user.active || user.userClass == 'enabled'}
52+
/>
4953
</div>
5054
<div class="data">
5155
<input

‎src/routes/profile/+page.svelte

Copy file name to clipboardExpand all lines: src/routes/profile/+page.svelte
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</script>
1414

1515
<div>
16-
<div>ID: {$profile.id}</div>
16+
<div>ID: {$profile.id || $profile.dn}</div>
1717
<div>Email: {$profile.email}</div>
18-
<div>Active: {$profile.active ? 'yes' : 'no'}</div>
18+
<div>Active: {$profile.active || $profile.userClass == 'enabled' ? 'yes' : 'no'}</div>
1919
<div>Admin: {$profile.admin ? 'yes' : 'no'}</div>
2020
</div>

‎src/routes/roles/[id]/+page.svelte

Copy file name to clipboardExpand all lines: src/routes/roles/[id]/+page.svelte
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
import { page } from '$app/stores'
44
</script>
55

6-
<Role pk={Number($page.params.id)} />
6+
<Role pk={$page.params.id} />

‎src/routes/users/[id]/+page.svelte

Copy file name to clipboardExpand all lines: src/routes/users/[id]/+page.svelte
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
import { page } from '$app/stores'
44
</script>
55

6-
<User pk={Number($page.params.id)} />
6+
<User pk={$page.params.id} />

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.