movoHelmChartIssue

Signed-off-by: Yogi_Wang <yawang@vmware.com>
This commit is contained in:
Yogi_Wang 2019-03-22 10:00:21 +08:00
parent e538a4c448
commit 309696b575
4 changed files with 14 additions and 15 deletions

View File

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

View File

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

View File

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

View File

@ -55,10 +55,8 @@ export class ConfirmationDialogComponent implements OnDestroy {
} }
} }
open(): void { open(msg?: ConfirmationMessage): void {
this.opened = true; if (msg) {
}
openMessage(msg: ConfirmationMessage): void {
this.dialogTitle = msg.title; this.dialogTitle = msg.title;
this.message = msg; this.message = msg;
this.translate.get(this.dialogTitle).subscribe((res: string) => this.dialogTitle = res); this.translate.get(this.dialogTitle).subscribe((res: string) => this.dialogTitle = res);
@ -67,6 +65,7 @@ export class ConfirmationDialogComponent implements OnDestroy {
}); });
// Open dialog // Open dialog
this.buttons = msg.buttons; this.buttons = msg.buttons;
}
this.opened = true; this.opened = true;
} }