diff --git a/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.html b/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.html index 919ab5b7..f4c3fa6d 100644 --- a/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.html +++ b/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.html @@ -2,7 +2,7 @@

{{ subnet.id }} Область: - {{subnet.default_gateway}} + {{ subnetWithoutMask }}

diff --git a/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.ts b/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.ts index aa0c6da8..efaedd30 100644 --- a/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.ts +++ b/projects/multidirectory-app/src/app/features/dhcp/dhcp-areas-item/dhcp-areas-item.ts @@ -30,6 +30,14 @@ export default class DhcpAreasItem { private readonly dhcp = inject(DhcpApiService); onSelectedTabIndexChange = output(); + get subnetWithoutMask(): string { + const subnet = this.subnet?.subnet; + if (!subnet) { + return ''; + } + return subnet.substring(0, subnet.indexOf('/')); + } + constructor() { effect(() => { const tabs = untracked(() => this.tabs()); diff --git a/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts b/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts index 5bcb564f..49177bf3 100644 --- a/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts +++ b/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts @@ -70,7 +70,7 @@ export class DHCPSetupWizardComponent { subnet: this.form.subnetMask.value, pool: `${this.form.startIp.value}-${this.form.endIp.value}`, valid_lifetime: lifetime, - default_gateway: this.form.defaultGateway.value, + default_gateway: this.form.defaultGateway.value || null, }; if (!this.isResetForm) {