trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web/admin: fix display when groups/users don't fit on a single row 

closes #2030

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-12-30 23:03:33 +01:00
parent 61b4fcb5f3
commit bf8ce55eea
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/src/pages/groups/GroupForm.ts
View File

@ -2,7 +2,7 @@ import YAML from "yaml";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, css, html } from "lit";
import { customElement } from "lit/decorators.js"; import { customElement } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js"; import { ifDefined } from "lit/directives/if-defined.js";
import { until } from "lit/directives/until.js"; import { until } from "lit/directives/until.js";
@ -21,6 +21,17 @@ import "./MemberSelectModal";
@customElement("ak-group-form") @customElement("ak-group-form")
export class GroupForm extends ModelForm<Group, string> { export class GroupForm extends ModelForm<Group, string> {
static get styles(): CSSResult[] {
return super.styles.concat(css`
.pf-c-button.pf-m-control {
height: 100%;
}
.pf-c-form-control {
height: auto !important;
}
`);
}
loadInstance(pk: string): Promise<Group> { loadInstance(pk: string): Promise<Group> {
return new CoreApi(DEFAULT_CONFIG).coreGroupsRetrieve({ return new CoreApi(DEFAULT_CONFIG).coreGroupsRetrieve({
groupUuid: pk, groupUuid: pk,

13
web/src/pages/users/UserForm.ts
View File

@ -2,7 +2,7 @@ import YAML from "yaml";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { TemplateResult, html } from "lit"; import { CSSResult, TemplateResult, css, html } from "lit";
import { customElement } from "lit/decorators.js"; import { customElement } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js"; import { ifDefined } from "lit/directives/if-defined.js";
import { until } from "lit/directives/until.js"; import { until } from "lit/directives/until.js";
@ -18,6 +18,17 @@ import "./GroupSelectModal";
@customElement("ak-user-form") @customElement("ak-user-form")
export class UserForm extends ModelForm<User, number> { export class UserForm extends ModelForm<User, number> {
static get styles(): CSSResult[] {
return super.styles.concat(css`
.pf-c-button.pf-m-control {
height: 100%;
}
.pf-c-form-control {
height: auto !important;
}
`);
}
loadInstance(pk: number): Promise<User> { loadInstance(pk: number): Promise<User> {
return new CoreApi(DEFAULT_CONFIG).coreUsersRetrieve({ return new CoreApi(DEFAULT_CONFIG).coreUsersRetrieve({
id: pk, id: pk,