Merge pull request #4201 from pengpengshui/batchDelection

Modify endpoint button name unsame with others issue
This commit is contained in:
pengpengshui 2018-01-31 17:26:32 +08:00 committed by GitHub
commit 9f42b42ffd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 5 deletions

View File

@ -15,7 +15,7 @@ export const ENDPOINT_TEMPLATE = `
<clr-datagrid [clrDgLoading]="loading" [(clrDgSelected)]="selectedRow" (clrDgSelectedChange)="selectedChange()"> <clr-datagrid [clrDgLoading]="loading" [(clrDgSelected)]="selectedRow" (clrDgSelectedChange)="selectedChange()">
<clr-dg-action-bar> <clr-dg-action-bar>
<button type="button" class="btn btn-sm btn-secondary" (click)="openModal()"><clr-icon shape="plus" size="16"></clr-icon>&nbsp;{{'DESTINATION.NEW_ENDPOINT' | translate}}</button> <button type="button" class="btn btn-sm btn-secondary" (click)="openModal()"><clr-icon shape="plus" size="16"></clr-icon>&nbsp;{{'DESTINATION.NEW_ENDPOINT' | translate}}</button>
<button type="button" class="btn btn-sm btn-secondary" [disabled]="!(selectedRow.length ===1)" (click)="editTargets(selectedRow)" ><clr-icon shape="pencil" size="16"></clr-icon>&nbsp;{{'DESTINATION.TITLE_EDIT' | translate}}</button> <button type="button" class="btn btn-sm btn-secondary" [disabled]="!(selectedRow.length ===1)" (click)="editTargets(selectedRow)" ><clr-icon shape="pencil" size="16"></clr-icon>&nbsp;{{'DESTINATION.EDIT' | translate}}</button>
<button type="button" class="btn btn-sm btn-secondary" [disabled]="!selectedRow.length" (click)="deleteTargets(selectedRow)"><clr-icon shape="times" size="16"></clr-icon>&nbsp;{{'DESTINATION.DELETE' | translate}}</button> <button type="button" class="btn btn-sm btn-secondary" [disabled]="!selectedRow.length" (click)="deleteTargets(selectedRow)"><clr-icon shape="times" size="16"></clr-icon>&nbsp;{{'DESTINATION.DELETE' | translate}}</button>
</clr-dg-action-bar> </clr-dg-action-bar>
<clr-dg-column [clrDgField]="'name'">{{'DESTINATION.NAME' | translate}}</clr-dg-column> <clr-dg-column [clrDgField]="'name'">{{'DESTINATION.NAME' | translate}}</clr-dg-column>

View File

@ -354,6 +354,7 @@ export class ReplicationComponent implements OnInit, OnDestroy {
hideJobs() { hideJobs() {
this.search.ruleId = 0; this.search.ruleId = 0;
this.jobs = [];
} }
stopJobs() { stopJobs() {

View File

@ -31,7 +31,7 @@
"clarity-icons": "^0.10.17", "clarity-icons": "^0.10.17",
"clarity-ui": "^0.10.17", "clarity-ui": "^0.10.17",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"harbor-ui": "0.6.42", "harbor-ui": "0.6.43",
"intl": "^1.2.5", "intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2", "mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0", "ngx-cookie": "^1.0.0",

View File

@ -353,7 +353,8 @@
"TEST_CONNECTION": "Test Connection", "TEST_CONNECTION": "Test Connection",
"TITLE_EDIT": "Edit Endpoint", "TITLE_EDIT": "Edit Endpoint",
"TITLE_ADD": "Create Endpoint", "TITLE_ADD": "Create Endpoint",
"DELETE": "Delete Endpoint", "EDIT": "Edit",
"DELETE": "Delete",
"TESTING_CONNECTION": "Testing Connection...", "TESTING_CONNECTION": "Testing Connection...",
"TEST_CONNECTION_SUCCESS": "Connection tested successfully.", "TEST_CONNECTION_SUCCESS": "Connection tested successfully.",
"TEST_CONNECTION_FAILURE": "Failed to ping endpoint.", "TEST_CONNECTION_FAILURE": "Failed to ping endpoint.",

View File

@ -353,7 +353,8 @@
"TEST_CONNECTION": "Comprobar conexión", "TEST_CONNECTION": "Comprobar conexión",
"TITLE_EDIT": "Editar Endpoint", "TITLE_EDIT": "Editar Endpoint",
"TITLE_ADD": "Crear Endpoint", "TITLE_ADD": "Crear Endpoint",
"DELETE": "Eliminar Endpoint", "EDIT": "Editar",
"DELETE": "Eliminar",
"TESTING_CONNECTION": "Comprobar conexión...", "TESTING_CONNECTION": "Comprobar conexión...",
"TEST_CONNECTION_SUCCESS": "Conexión comprobada satisfactoriamente.", "TEST_CONNECTION_SUCCESS": "Conexión comprobada satisfactoriamente.",
"TEST_CONNECTION_FAILURE": "Fallo al comprobar el endpoint.", "TEST_CONNECTION_FAILURE": "Fallo al comprobar el endpoint.",

View File

@ -353,7 +353,8 @@
"TEST_CONNECTION": "测试连接", "TEST_CONNECTION": "测试连接",
"TITLE_EDIT": "编辑目标", "TITLE_EDIT": "编辑目标",
"TITLE_ADD": "新建目标", "TITLE_ADD": "新建目标",
"DELETE": "删除目标", "EDIT": "编辑",
"DELETE": "删除",
"TESTING_CONNECTION": "正在测试连接...", "TESTING_CONNECTION": "正在测试连接...",
"TEST_CONNECTION_SUCCESS": "测试连接成功。", "TEST_CONNECTION_SUCCESS": "测试连接成功。",
"TEST_CONNECTION_FAILURE": "测试连接失败。", "TEST_CONNECTION_FAILURE": "测试连接失败。",