Skip to content

form fixes #2836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filipslezaklab merged 1 commit into from
Apr 29, 2026
Merged

form fixes #2836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions web/src/pages/CERulePage/CERulePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ const Content = ({ rule: initialRule, tab }: Props) => {
.superRefine((vals, ctx) => {
// check for collisions
const message = m.acl_rule_error_allow_deny_conflict();
if (!vals.allow_all_users && !vals.deny_all_users) {
if (!vals.allow_all_users && !vals.deny_all_users && vals.restrict_users) {
if (intersection(vals.allowed_users, vals.denied_users).length) {
ctx.addIssue({
path: ['allowed_users'],
Expand All @@ -357,6 +357,8 @@ const Content = ({ rule: initialRule, tab }: Props) => {
message,
});
}
}
if (!vals.deny_all_groups && !vals.allow_all_groups && vals.restrict_groups) {
if (intersection(vals.allowed_groups, vals.denied_groups).length) {
ctx.addIssue({
path: ['allowed_groups'],
Expand All @@ -370,7 +372,11 @@ const Content = ({ rule: initialRule, tab }: Props) => {
});
}
}
if (!vals.allow_all_network_devices && !vals.deny_all_network_devices) {
if (
vals.restrict_devices &&
!vals.allow_all_network_devices &&
!vals.deny_all_network_devices
) {
if (
intersection(vals.allowed_network_devices, vals.denied_network_devices)
.length
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/EditLocationPage/EditLocationPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ const getDisconnectRelevantFieldLabel = (field: DisconnectRelevantField): string
case 'service_location_mode':
return m.location_edit_section_location_type();
case 'allow_all_groups':
return m.location_access_section_label();
return m.location_access_all_groups_have_access();
case 'allowed_groups':
return m.location_access_section_label();
}
Expand Down
Loading