Skip to content

Commit fcef4e0

Browse files
committed
fix enum bug
1 parent 52ef71c commit fcef4e0

File tree

12 files changed

+12
-56
lines changed

12 files changed

+12
-56
lines changed

src/app/application-detail/application-detail.component.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,4 @@ export class ApplicationDetailComponent implements OnInit {
199199
}
200200
}
201201

202-
getIPMethodEnumString(value: number) {
203-
return IPMethod[value];
204-
}
205-
206-
207202
}

src/app/cclog-detail/cclog-detail.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h2>
3636
<textarea matInput [value]="log.raw_request" placeholder="Raw Request" rows="16" readonly="true"></textarea>
3737
</mat-form-field>
3838
<mat-form-field>
39-
<input matInput [value]="getPolicyActionEnumString(log.action)" placeholder="Action" readonly="true"/>
39+
<input matInput [value]="log.action.name" placeholder="Action" readonly="true"/>
4040
</mat-form-field>
4141

4242
<section></section>

src/app/cclog-detail/cclog-detail.component.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,4 @@ export class CCLogDetailComponent implements OnInit {
3737
this.location.back();
3838
}
3939

40-
getPolicyActionEnumString(value: number) {
41-
return PolicyAction[value];
42-
}
43-
44-
4540
}

src/app/cclogs/cclogs.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
<ng-container matColumnDef="action">
5757
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
58-
<mat-cell *matCellDef="let element"> {{ getPolicyActionEnumString(element.action) }} </mat-cell>
58+
<mat-cell *matCellDef="let element"> {{ element.action.name }} </mat-cell>
5959
</ng-container>
6060

6161
<ng-container matColumnDef="policy_id">

src/app/cclogs/cclogs.component.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,6 @@ export class CCLogsComponent implements OnInit {
8989
return new Date(unix*1000).toLocaleString('zh-CN', {hour12: false});
9090
}
9191

92-
getPolicyActionEnumString(value: number) {
93-
return PolicyAction[value];
94-
}
95-
96-
97-
9892
}
9993

10094

src/app/firewall/firewall.component.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@ export class FirewallComponent implements OnInit {
6565
}
6666
}
6767

68-
getChkPointEnumString(value: number) {
69-
return ChkPoint[value];
70-
}
71-
72-
getPolicyActionEnumString(value: number) {
73-
return PolicyAction[value];
74-
}
75-
7668
getCCPolicy(id: number) {
7769
var self = this;
7870
this.applicationService.getResponse('getccpolicy', function(obj: CCPolicy){

src/app/log-detail/log-detail.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h2>
3636
<textarea matInput [value]="log.raw_request" placeholder="Raw Request" rows="16" readonly="true"></textarea>
3737
</mat-form-field>
3838
<mat-form-field>
39-
<input matInput [value]="getPolicyActionEnumString(log.action)" placeholder="Action" readonly="true"/>
39+
<input matInput [value]="log.action.name" placeholder="Action" readonly="true"/>
4040
</mat-form-field>
4141
<section>
4242
<label>Policy</label>

src/app/log-detail/log-detail.component.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,4 @@ export class LogDetailComponent implements OnInit {
3636
this.location.back();
3737
}
3838

39-
getPolicyActionEnumString(value: number) {
40-
return PolicyAction[value];
41-
}
42-
4339
}

src/app/logs/logs.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
<ng-container matColumnDef="action">
5757
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
58-
<mat-cell *matCellDef="let element"> {{ getPolicyActionEnumString(element.action) }} </mat-cell>
58+
<mat-cell *matCellDef="let element"> {{ element.action.name }} </mat-cell>
5959
</ng-container>
6060

6161
<ng-container matColumnDef="policy_id">

src/app/logs/logs.component.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ export class LogsComponent implements OnInit {
8989
return new Date(unix*1000).toLocaleString('zh-CN', {hour12: false});
9090
}
9191

92-
getPolicyActionEnumString(value: number) {
93-
return PolicyAction[value];
94-
}
95-
96-
9792
}
9893

9994
import { CollectionViewer, DataSource } from "@angular/cdk/collections";

0 commit comments

Comments
 (0)