mirror of
https://github.com/GNS3/gns3-web-ui.git
synced 2025-01-19 03:06:31 +00:00
Bug fixing
This commit is contained in:
parent
63bcd6f4b2
commit
b25cfa229c
@ -66,7 +66,7 @@ export class ProjectMapMenuComponent implements OnInit, OnDestroy {
|
||||
|
||||
public onDrawingSaved() {
|
||||
this.resetDrawToolChoice();
|
||||
}
|
||||
}
|
||||
|
||||
public resetDrawToolChoice() {
|
||||
this.drawTools.isRectangleChosen = false;
|
||||
|
@ -466,9 +466,11 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
|
||||
|
||||
dialogRef.afterClosed().subscribe(() => {
|
||||
subscription.unsubscribe();
|
||||
this.projectService.open(this.server, uuid).subscribe(() => {
|
||||
this.router.navigate(['/server', this.server.id, 'project', uuid]);
|
||||
});
|
||||
if (uuid) {
|
||||
this.projectService.open(this.server, uuid).subscribe(() => {
|
||||
this.router.navigate(['/server', this.server.id, 'project', uuid]);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -15,6 +15,10 @@
|
||||
}
|
||||
|
||||
.file-name-form-field {
|
||||
width: 90%;
|
||||
}
|
||||
|
||||
.empty {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
[uploader]="uploader"
|
||||
/>
|
||||
<button mat-raised-button color="primary" (click)="file.click()" class="file-button">Choose file</button>
|
||||
<mat-form-field class="file-name-form-field">
|
||||
<mat-form-field [ngClass]="{ empty: !isDeleteVisible }" class="file-name-form-field">
|
||||
<input
|
||||
matInput
|
||||
type="text"
|
||||
|
@ -143,6 +143,6 @@ export class ImportProjectDialogComponent implements OnInit {
|
||||
prepareUploadPath(): string {
|
||||
this.uuid = uuid();
|
||||
const projectName = this.projectNameForm.controls['projectName'].value;
|
||||
return this.projectService.getUploadPath(this.server, uuid, projectName);
|
||||
return this.projectService.getUploadPath(this.server, this.uuid, projectName);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user