Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-18 14:47:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7646 from pureshine/fix-replicate-bug

Browse Source 
Fix failed to get filter data when switching replication mode
This commit is contained in:
Fangyuan Cheng 2019-05-06 16:18:46 +08:00 committed by GitHub
commit 26799fc7f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/portal/lib/src/create-edit-rule/create-edit-rule.component.html
View File

@ -21,8 +21,8 @@
<!-- replication mode --> <!-- replication mode -->
<div class="form-group form-group-override"> <div class="form-group form-group-override">
<label class="form-group-label-override">{{'REPLICATION.REPLI_MODE' | translate}}</label> <label class="form-group-label-override">{{'REPLICATION.REPLI_MODE' | translate}}</label>
<div class="radio-inline" [class.disabled]="policyId >= 0"> <div class="radio-inline" [class.disabled]="policyId >= 0 || onGoing">
<input type="radio" id="push_base" name="replicationMode" [value]=true [disabled]="policyId >= 0" [(ngModel)]="isPushMode" (change)="modeChange()" [ngModelOptions]="{standalone: true}"> <input type="radio" id="push_base" name="replicationMode" [value]=true [disabled]="policyId >= 0 || onGoing" [(ngModel)]="isPushMode" (change)="modeChange()" [ngModelOptions]="{standalone: true}">
<label for="push_base">Push-based</label> <label for="push_base">Push-based</label>
<clr-tooltip class="mode-tooltip"> <clr-tooltip class="mode-tooltip">
<clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon> <clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
@ -31,8 +31,8 @@
</clr-tooltip-content> </clr-tooltip-content>
</clr-tooltip> </clr-tooltip>
</div> </div>
<div class="radio-inline" [class.disabled]="policyId >= 0"> <div class="radio-inline" [class.disabled]="policyId >= 0 || onGoing">
<input type="radio" id="pull_base" name="replicationMode" [value]=false [disabled]="policyId >= 0" [(ngModel)]="isPushMode" [ngModelOptions]="{standalone: true}"> <input type="radio" id="pull_base" name="replicationMode" [value]=false [disabled]="policyId >= 0 || onGoing" [(ngModel)]="isPushMode" [ngModelOptions]="{standalone: true}">
<label for="pull_base">Pull-based</label> <label for="pull_base">Pull-based</label>
<clr-tooltip class="mode-tooltip"> <clr-tooltip class="mode-tooltip">
<clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon> <clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>

2
src/portal/lib/src/replication/replication.component.ts
View File

@ -488,6 +488,8 @@ export class ReplicationComponent implements OnInit, OnDestroy {
if (seconds <= 0 && timesDiff > 0) { if (seconds <= 0 && timesDiff > 0) {
return timesDiff + 'ms'; return timesDiff + 'ms';
} else {
return '-';
} }
} }
} }