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

Merge pull request #1478 from GNS3/release-v2.2.44

Browse Source 
Release v2.2.44
This commit is contained in:
Jeremy Grossmann 2023-11-06 16:27:49 +10:00 committed by GitHub
commit ca408663a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "gns3-web-ui",
"version": "2.2.42",
"version": "2.2.44",
"author": {
"name": "GNS3 Technology Inc.",
"email": "developers@gns3.com"

23
src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html
View File

@ -42,6 +42,29 @@
/>
</mat-form-field>
<mat-form-field class="form-field" *ngIf="element.width !== undefined">
<input
matInput
[ngModelOptions]="{ standalone: true }"
placeholder="Width"
min="0"
type="number"
[(ngModel)]="element.width"
/>
</mat-form-field>
<mat-form-field class="form-field" *ngIf="element.height !== undefined">
<input
matInput
[ngModelOptions]="{ standalone: true }"
placeholder="Height"
min="0"
type="number"
[(ngModel)]="element.height"
/>
</mat-form-field>
<mat-form-field class="form-field" *ngIf="element.rx !== undefined">
<input
matInput

6
src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts
View File

@ -49,6 +49,8 @@ export class StyleEditorDialogComponent implements OnInit {
if (this.drawing.element instanceof RectElement || this.drawing.element instanceof EllipseElement) {
this.element.fill = this.drawing.element.fill;
this.element.width = this.drawing.element.width;
this.element.height = this.drawing.element.height;
this.element.stroke = this.drawing.element.stroke;
this.element.stroke_dasharray = this.drawing.element.stroke_dasharray;
this.element.stroke_width = this.drawing.element.stroke_width;
@ -79,6 +81,8 @@ export class StyleEditorDialogComponent implements OnInit {
if (this.drawing.element instanceof RectElement || this.drawing.element instanceof EllipseElement) {
this.drawing.element.fill = this.element.fill;
this.drawing.element.width = this.element.width;
this.drawing.element.height = this.element.height;
this.drawing.element.stroke = this.element.stroke;
this.drawing.element.stroke_dasharray = this.element.stroke_dasharray;
this.drawing.element.stroke_width = this.element.stroke_width;
@ -110,6 +114,8 @@ export class StyleEditorDialogComponent implements OnInit {
export class ElementData {
fill: string;
width: number;
height: number;
stroke: string;
stroke_width: number;
stroke_dasharray: string;

2
src/app/services/packet-capture.service.ts
View File

@ -9,7 +9,7 @@ export class PacketCaptureService {
startCapture(server: Server, project: Project, link: Link, name: string) {
location.assign(
`gns3+pcap://${server.host}:${server.port}?project_id=${project.project_id}&link_id=${link.link_id}&name=${name}`
`gns3+pcap://${server.host}:${server.port}?protocol=${server.protocol.slice(0, -1)}&project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}`
);
}
}