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

Merge pull request #7214 from jwangyangls/fixHelmChartIssue

Browse Source 
moveHelmChartIssue
This commit is contained in:
Mia ZHOU 2019-03-26 10:25:37 +08:00 committed by GitHub
commit 542c460e3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/src/app/app.module.ts
View File

@ -40,7 +40,7 @@ registerLocaleData(localeFr, 'fr-fr');
export function initConfig(configService: AppConfigService, skinableService: SkinableConfig) {
return () => {
skinableService.getCustomFile();
configService.load();
configService.load().subscribe();
};
}

2
src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts
View File

@ -283,7 +283,7 @@ export class ChartVersionComponent implements OnInit {
ConfirmationTargets.HELM_CHART_VERSION,
ConfirmationButtons.DELETE_CANCEL
);
this.confirmationDialog.openMessage(message);
this.confirmationDialog.open(message);
let hnd = setInterval(() => this.cdr.markForCheck(), 100);
setTimeout(() => clearInterval(hnd), 2000);
}

2
src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.ts
View File

@ -258,7 +258,7 @@ export class HelmChartComponent implements OnInit {
ConfirmationTargets.HELM_CHART,
ConfirmationButtons.DELETE_CANCEL
);
this.confirmationDialog.openMessage(message);
this.confirmationDialog.open(message);
}
confirmDeletion(message: ConfirmationAcknowledgement) {

23
src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts
View File

@ -55,18 +55,17 @@ export class ConfirmationDialogComponent implements OnDestroy {
}
}
open(): void {
this.opened = true;
}
openMessage(msg: ConfirmationMessage): void {
this.dialogTitle = msg.title;
this.message = msg;
this.translate.get(this.dialogTitle).subscribe((res: string) => this.dialogTitle = res);
this.translate.get(msg.message, { 'param': msg.param }).subscribe((res: string) => {
this.dialogContent = res;
});
// Open dialog
this.buttons = msg.buttons;
open(msg?: ConfirmationMessage): void {
if (msg) {
this.dialogTitle = msg.title;
this.message = msg;
this.translate.get(this.dialogTitle).subscribe((res: string) => this.dialogTitle = res);
this.translate.get(msg.message, { 'param': msg.param }).subscribe((res: string) => {
this.dialogContent = res;
});
// Open dialog
this.buttons = msg.buttons;
}
this.opened = true;
}