diff --git a/dashboard/src/components/GroupDialog.vue b/dashboard/src/components/GroupDialog.vue index 62f21880e..68a96c2ca 100644 --- a/dashboard/src/components/GroupDialog.vue +++ b/dashboard/src/components/GroupDialog.vue @@ -19,9 +19,9 @@ const group = ref(null); const busy = ref(false); const formError = ref({}); const name = ref(''); -const users = ref([]); +const userIds = ref([]); const allUsers = ref([]); -const apps = ref([]); +const appIds = ref([]); const allApps = ref([]); async function onSubmit() { @@ -29,7 +29,7 @@ async function onSubmit() { formError.value = {}; if (group.value) { - const [error] = await groupsModel.update(group.value.id, name.value, users.value, apps.value); + const [error] = await groupsModel.update(group.value.id, name.value, userIds.value, appIds.value); if (error) { if (error.body && error.body.message.indexOf('name') === 0) formError.value.name = error.body.message; else formError.value.generic = error.body ? error.body.message : 'Internal error'; @@ -37,7 +37,7 @@ async function onSubmit() { return console.error(error); } } else { - const [error] = await groupsModel.add(name.value, users.value, apps.value); + const [error] = await groupsModel.add(name.value, userIds.value, appIds.value); if (error) { if (error.body && error.body.message.indexOf('name') === 0) formError.value.name = error.body.message; else formError.value.generic = error.body ? error.body.message : 'Internal error'; @@ -63,13 +63,13 @@ defineExpose({ if (error) return console.error(error); result.forEach(u => u.label = (u.username || u.email)); allUsers.value = result; - users.value = g ? g.userIds : []; + userIds.value = g ? g.userIds : []; [error, result] = await appsModel.list(); if (error) return console.error(error); result.forEach(a => a.label = (a.label || a.fqdn)); allApps.value = result; - apps.value = g ? g.appIds : []; + appIds.value = g ? g.appIds : []; dialog.value.open(); } @@ -103,13 +103,14 @@ defineExpose({ +
{{ (user.username || user.email) }}
- +
- + diff --git a/src/externalldap.js b/src/externalldap.js index dfb4f3563..c0b5c100b 100644 --- a/src/externalldap.js +++ b/src/externalldap.js @@ -443,7 +443,7 @@ async function syncGroups(config, progressCallback) { if (error) debug('syncGroups: Failed to create group', groupName, error); } else { // convert local group to ldap group. 2 reasons: - // 1. we reset source flag when externalldap is disabled. if we renable, it automatically coverts + // 1. we reset source flag when externalldap is disabled. if we renable, it automatically converts // 2. externalldap connector usually implies user wants to user external users/groups. groups.update(result.id, { source: 'ldap' }); debug(`syncGroups: [up-to-date group] groupname=${groupName}`);