ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2024-12-20 13:33:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '2.2' into master-3.0

Browse Source 
# Conflicts:
#	package.json
#	src/app/models/templates/docker-template.ts
#	src/app/services/template-mocks.service.ts
#	yarn.lock
This commit is contained in:
grossmj 2024-11-20 12:37:26 +10:00
commit 27eecf2ec9
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html
View File

@ -66,6 +66,15 @@
placeholder="Start command" placeholder="Start command"
/> />
</mat-form-field> </mat-form-field>
<mat-form-field class="form-field">
<input
matInput
type="text"
[ngModelOptions]="{ standalone: true }"
[(ngModel)]="dockerTemplate.mac_address"
placeholder="Base MAC"
/>
</mat-form-field>
<mat-form-field class="form-field"> <mat-form-field class="form-field">
<input <input
formControlName="adapter" formControlName="adapter"

1
src/app/models/templates/docker-template.ts
View File

@ -11,6 +11,7 @@ export class DockerTemplate {
console_resolution: string; console_resolution: string;
console_type: string; console_type: string;
aux_type: string; aux_type: string;
mac_address: string;
custom_adapters: CustomAdapter[]; custom_adapters: CustomAdapter[];
default_name_format: string; default_name_format: string;
environment: string; environment: string;

1
src/app/services/template-mocks.service.ts
View File

@ -242,6 +242,7 @@ export class TemplateMocksService {
console_resolution: '1024x768', console_resolution: '1024x768',
console_type: 'telnet', console_type: 'telnet',
aux_type: 'none', aux_type: 'none',
mac_address: '',
custom_adapters: [], custom_adapters: [],
default_name_format: '{name}-{0}', default_name_format: '{name}-{0}',
environment: '', environment: '',