Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 10:45:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2885 from pengpengshui/master

Browse Source 
fix 2869/2870 about the  log of a pending status replication job
This commit is contained in:
Steven Zou 2017-07-27 21:43:01 +08:00 committed by GitHub
commit d7eb8df28e
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ui_ng/lib/src/replication/replication.component.html.ts
View File

@ -51,7 +51,7 @@ export const REPLICATION_TEMPLATE: string = `
<clr-dg-column [clrDgField]="'status'">{{'REPLICATION.STATUS' | translate}}</clr-dg-column>
<clr-dg-column [clrDgField]="'operation'">{{'REPLICATION.OPERATION' | translate}}</clr-dg-column>
<clr-dg-column [clrDgSortBy]="creationTimeComparator">{{'REPLICATION.CREATION_TIME' | translate}}</clr-dg-column>
<clr-dg-column [clrDgSortBy]="updateTimeComparator">{{'REPLICATION.END_TIME' | translate}}</clr-dg-column>
<clr-dg-column [clrDgSortBy]="updateTimeComparator">{{'REPLICATION.UPDATE_TIME' | translate}}</clr-dg-column>
<clr-dg-column>{{'REPLICATION.LOGS' | translate}}</clr-dg-column>
<clr-dg-placeholder>{{'REPLICATION.JOB_PLACEHOLDER' | translate }}</clr-dg-placeholder>
<clr-dg-row *clrDgItems="let j of jobs" [clrDgItem]='j'>
@ -61,9 +61,12 @@ export const REPLICATION_TEMPLATE: string = `
<clr-dg-cell>{{j.creation_time | date: 'short'}}</clr-dg-cell>
<clr-dg-cell>{{j.update_time | date: 'short'}}</clr-dg-cell>
<clr-dg-cell>
<a href="javascript:void(0);" (click)="viewLog(j.id)">
<span *ngIf="j.status=='pending'; else elseBlock" class="label">{{'REPLICATION.NO_LOGS' | translate}}</span>
<ng-template #elseBlock>
<a href="javascript:void(0);" (click)="viewLog(j.id)">
<clr-icon shape="clipboard"></clr-icon>
</a>
</a></ng-template>
</clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>

3
src/ui_ng/src/i18n/lang/en-us-lang.json
View File

@ -258,10 +258,11 @@
"STATUS": "Status",
"OPERATION": "Operation",
"CREATION_TIME": "Start Time",
"END_TIME": "End Time",
"UPDATE_TIME": "Update Time",
"LOGS": "Logs",
"OF": "of",
"ITEMS": "items",
"NO_LOGS": "No log",
"TOGGLE_ENABLE_TITLE": "Enable Rule",
"CONFIRM_TOGGLE_ENABLE_POLICY": "After enabling the replication rule, all repositories under the project will be replicated to the destination registry. \nPlease confirm to continue.",
"TOGGLE_DISABLE_TITLE": "Disable Rule",

3
src/ui_ng/src/i18n/lang/es-es-lang.json
View File

@ -258,9 +258,10 @@
"STATUS": "Estado",
"OPERATION": "Operación",
"CREATION_TIME": "Fecha de Inicio",
"END_TIME": "Fecha de Finalización",
"UPDATE_TIME": "Update time",
"LOGS": "Logs",
"OF": "of",
"NO_LOGS": "No log",
"ITEMS": "elementos",
"TOGGLE_ENABLE_TITLE": "Activar Regla",
"CONFIRM_TOGGLE_ENABLE_POLICY": "Después de la activación de esta regla, todos los repositorios de este proyecto serán replicados al registro de destino.\nPor favor, confirme para continuar.",

3
src/ui_ng/src/i18n/lang/zh-cn-lang.json
View File

@ -258,10 +258,11 @@
"STATUS": "状态",
"OPERATION": "操作",
"CREATION_TIME": "创建时间",
"END_TIME": "结束时间",
"UPDATE_TIME": "更新时间",
"LOGS": "日志",
"OF": "共计",
"ITEMS": "条记录",
"NO_LOGS": "无日志",
"TOGGLE_ENABLE_TITLE": "启用规则",
"CONFIRM_TOGGLE_ENABLE_POLICY": "启用规则后，该项目下的所有镜像仓库将复制到目标实例。\n请确认继续。",
"TOGGLE_DISABLE_TITLE": "停用规则",