Merge pull request #153 from chengyumeng/hotfix/ingress

Hotfix/ingress
Qihoo360 · Dec 14, 2018 · 9b670a3 · 9b670a3
2 parents 6519fd2 + ad25e6c
commit 9b670a3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts b/src/frontend/src/app/admin/ingress/list-ingress/list-ingress.component.ts
@@ -52,7 +52,7 @@ export class ListIngressComponent implements OnInit {
     this.delete.emit(ingress);
   }
 
-  editService(ingress: Ingress) {
+  editIngress(ingress: Ingress) {
     this.edit.emit(ingress);
   }
 

diff --git a/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.html b/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.html
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
     <div class="row flex-items-xs-between flex-items-xs-top" style="padding-left: 15px; padding-right: 15px;">
-      <h2 class="header-title">已删除服务列表</h2>
+      <h2 class="header-title">已删除 Ingress 列表</h2>
     </div>
     <clr-datagrid (clrDgRefresh)="refresh($event)">
       <clr-dg-column [clrDgField]="'id'" class="col-query-id">

diff --git a/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.ts b/src/frontend/src/app/admin/ingress/trash-ingress/trash-ingress.component.ts
@@ -31,8 +31,8 @@ export class TrashIngressComponent implements OnInit, OnDestroy {
     this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => {
       if (message &&
         message.state === ConfirmationState.CONFIRMED &&
-        message.source === ConfirmationTargets.TRASH_SERVICE) {
-        let id = message.data;
+        message.source === ConfirmationTargets.TRASH_INGRESS) {
+        const id = message.data;
         this.ingressService.deleteById(id, 0, false)
           .subscribe(
             response => {
@@ -71,7 +71,7 @@ export class TrashIngressComponent implements OnInit, OnDestroy {
     this.ingressService.list(this.pageState, 'true')
       .subscribe(
         response => {
-          let data = response.data;
+          const data = response.data;
           this.pageState.page.totalPage = data.totalPage;
           this.pageState.page.totalCount = data.totalCount;
           this.ingresses = data.list;
@@ -81,7 +81,7 @@ export class TrashIngressComponent implements OnInit, OnDestroy {
   }
 
   deleteIngress(ingress: Ingress) {
-    let deletionMessage = new ConfirmationMessage(
+    const deletionMessage = new ConfirmationMessage(
       '删除 Ingress 确认',
       '你确认永久删除 Ingress ' + ingress.name + ' ？删除后将不可恢复！',
       ingress.id,