Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e9b6bc7a3d | ||
|
|
f5545b48f0 |
@@ -71,10 +71,6 @@ function onUserChange(evt, targetRoleUuid) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function permissionDisplayName(scope) {
|
|
||||||
return props.permissions.find(p => p.scope === scope)?.display_name || scope
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleRolePermission(role, pid, checked) {
|
function toggleRolePermission(role, pid, checked) {
|
||||||
emit('toggleRolePermission', role, pid, checked)
|
emit('toggleRolePermission', role, pid, checked)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,14 +15,11 @@ const props = defineProps({
|
|||||||
const emit = defineEmits(['createOrg', 'openOrg', 'updateOrg', 'deleteOrg', 'toggleOrgPermission', 'openDialog', 'deletePermission', 'renamePermissionDisplay', 'createOidcClient', 'openOidcClient', 'deleteOidcClient', 'openServerConfig', 'navigateOut'])
|
const emit = defineEmits(['createOrg', 'openOrg', 'updateOrg', 'deleteOrg', 'toggleOrgPermission', 'openDialog', 'deletePermission', 'renamePermissionDisplay', 'createOidcClient', 'openOidcClient', 'deleteOidcClient', 'openServerConfig', 'navigateOut'])
|
||||||
|
|
||||||
// Template refs for navigation
|
// Template refs for navigation
|
||||||
const orgSection = ref(null)
|
|
||||||
const orgActionsRef = ref(null)
|
const orgActionsRef = ref(null)
|
||||||
const orgTableRef = ref(null)
|
const orgTableRef = ref(null)
|
||||||
const permMatrixRef = ref(null)
|
const permMatrixRef = ref(null)
|
||||||
const permActionsRef = ref(null)
|
const permActionsRef = ref(null)
|
||||||
const permTableRef = ref(null)
|
const permTableRef = ref(null)
|
||||||
const oidcActionsRef = ref(null)
|
|
||||||
const oidcTableRef = ref(null)
|
|
||||||
|
|
||||||
const sortedOrgs = computed(() => [...props.orgs].sort((a,b)=> {
|
const sortedOrgs = computed(() => [...props.orgs].sort((a,b)=> {
|
||||||
const nameCompare = a.org.display_name.localeCompare(b.org.display_name)
|
const nameCompare = a.org.display_name.localeCompare(b.org.display_name)
|
||||||
@@ -62,10 +59,6 @@ const sortedPermissions = computed(() => [...props.permissions].sort((a,b)=> a.s
|
|||||||
const isMasterAdmin = computed(() => props.info?.ctx.permissions.includes('auth:admin'))
|
const isMasterAdmin = computed(() => props.info?.ctx.permissions.includes('auth:admin'))
|
||||||
const isOrgAdmin = computed(() => props.info?.ctx.permissions.includes('auth:org:admin'))
|
const isOrgAdmin = computed(() => props.info?.ctx.permissions.includes('auth:org:admin'))
|
||||||
|
|
||||||
function permissionDisplayName(scope) {
|
|
||||||
return props.permissions.find(p => p.scope === scope)?.display_name || scope
|
|
||||||
}
|
|
||||||
|
|
||||||
function getRoleNames(org) {
|
function getRoleNames(org) {
|
||||||
// org.roles is dict[UUID, Role]
|
// org.roles is dict[UUID, Role]
|
||||||
return Object.values(org.roles)
|
return Object.values(org.roles)
|
||||||
|
|||||||
@@ -45,6 +45,13 @@ def migrate_v4(d: dict, ctx: MigrationCtx) -> None:
|
|||||||
d["oidc"] = {"clients": {}, "key": base64.standard_b64encode(secret_key()).decode()}
|
d["oidc"] = {"clients": {}, "key": base64.standard_b64encode(secret_key()).decode()}
|
||||||
|
|
||||||
|
|
||||||
|
def migrate_v5(d: dict, ctx: MigrationCtx) -> None:
|
||||||
|
"""Convert config.listen from str to list[str] if needed."""
|
||||||
|
listen = d["config"].get("listen")
|
||||||
|
if listen and isinstance(listen, str):
|
||||||
|
d["config"]["listen"] = [listen]
|
||||||
|
|
||||||
|
|
||||||
migrations = sorted(
|
migrations = sorted(
|
||||||
[f for n, f in globals().items() if n.startswith("migrate_v")],
|
[f for n, f in globals().items() if n.startswith("migrate_v")],
|
||||||
key=lambda f: int(f.__name__.removeprefix("migrate_v")),
|
key=lambda f: int(f.__name__.removeprefix("migrate_v")),
|
||||||
|
|||||||
Reference in New Issue
Block a user