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

Merge pull request #6606 from pureshine/download-cert

Browse Source 
Fix download certificate link bug
This commit is contained in:
Fangyuan Cheng 2018-12-24 11:27:41 +08:00 committed by GitHub
commit c0745c6ee5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/portal/lib/src/repository-gridview/repository-gridview.component.ts
View File

@ -8,7 +8,8 @@ import {
ChangeDetectorRef, ChangeDetectorRef,
EventEmitter, EventEmitter,
OnChanges, OnChanges,
SimpleChanges SimpleChanges,
Inject
} from "@angular/core"; } from "@angular/core";
import { Router } from "@angular/router"; import { Router } from "@angular/router";
import { forkJoin } from "rxjs"; import { forkJoin } from "rxjs";
@ -35,7 +36,7 @@ import {Tag} from '../service/interface';
import {GridViewComponent} from '../gridview/grid-view.component'; import {GridViewComponent} from '../gridview/grid-view.component';
import {OperationService} from "../operation/operation.service"; import {OperationService} from "../operation/operation.service";
import {OperateInfo, OperationState, operateChanges} from "../operation/operate"; import {OperateInfo, OperationState, operateChanges} from "../operation/operate";
import { downloadUrl } from '../service.config'; import {SERVICE_CONFIG, IServiceConfig, downloadUrl } from '../service.config';
@Component({ @Component({
selector: "hbr-repository-gridview", selector: "hbr-repository-gridview",
templateUrl: "./repository-gridview.component.html", templateUrl: "./repository-gridview.component.html",
@ -79,7 +80,8 @@ export class RepositoryGridviewComponent implements OnChanges, OnInit {
@ViewChild("gridView") gridView: GridViewComponent; @ViewChild("gridView") gridView: GridViewComponent;
constructor(private errorHandler: ErrorHandler, constructor(@Inject(SERVICE_CONFIG) private configInfo: IServiceConfig,
private errorHandler: ErrorHandler,
private translateService: TranslateService, private translateService: TranslateService,
private repositoryService: RepositoryService, private repositoryService: RepositoryService,
private systemInfoService: SystemInfoService, private systemInfoService: SystemInfoService,
@ -87,6 +89,9 @@ export class RepositoryGridviewComponent implements OnChanges, OnInit {
private operationService: OperationService, private operationService: OperationService,
private ref: ChangeDetectorRef, private ref: ChangeDetectorRef,
private router: Router) { private router: Router) {
if (this.configInfo && this.configInfo.systemInfoEndpoint) {
this.downloadLink = this.configInfo.systemInfoEndpoint + "/getcert";
}
} }
public get registryUrl(): string { public get registryUrl(): string {