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

Merge pull request #9864 from jwangyangls/fix-webhook-modal

Browse Source 
Fix webhook testing-error bug
This commit is contained in:
jwangyangls 2019-11-14 19:11:40 +08:00 committed by GitHub
commit 01ca8a7a36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.ts
View File

@ -77,9 +77,9 @@ export class AddWebhookFormComponent implements OnInit, OnChanges {
if (this.isModify) { if (this.isModify) {
this.inlineAlert.showInlineError("WEBHOOK.TEST_ENDPOINT_FAILURE"); this.inlineAlert.showInlineError("WEBHOOK.TEST_ENDPOINT_FAILURE");
} else { } else {
this.checkBtnState = ClrLoadingState.DEFAULT;
this.messageHandlerService.handleError(error); this.messageHandlerService.handleError(error);
} }
this.checkBtnState = ClrLoadingState.DEFAULT;
} }
); );
} }
@ -87,6 +87,7 @@ export class AddWebhookFormComponent implements OnInit, OnChanges {
onCancel() { onCancel() {
this.close.emit(false); this.close.emit(false);
this.currentForm.reset(); this.currentForm.reset();
this.inlineAlert.close();
} }
onSubmit() { onSubmit() {
@ -101,6 +102,7 @@ export class AddWebhookFormComponent implements OnInit, OnChanges {
.subscribe( .subscribe(
response => { response => {
this.edit.emit(this.isModify); this.edit.emit(this.isModify);
this.inlineAlert.close();
}, },
error => { error => {
this.isModify this.isModify

2
src/portal/src/app/project/webhook/add-webhook/add-webhook.component.ts
View File

@ -16,7 +16,7 @@ import { AddWebhookFormComponent } from "../add-webhook-form/add-webhook-form.co
}) })
export class AddWebhookComponent implements OnInit { export class AddWebhookComponent implements OnInit {
isOpen: boolean = false; isOpen: boolean = false;
closable: boolean = true; closable: boolean = false;
staticBackdrop: boolean = true; staticBackdrop: boolean = true;
@Input() projectId: number; @Input() projectId: number;