OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Wait for form to be loaded before trying to access date picker
Oliver Günther4d12bd4a2430
diff --git a/frontend/src/app/shared/components/fields/edit/field-types/combined-date-edit-field.component.html b/frontend/src/app/shared/components/fields/edit/field-types/combined-date-edit-field.component.htmlindex 11668a3a84f..0e155ff1d47 100644--- a/frontend/src/app/shared/components/fields/edit/field-types/combined-date-edit-field.component.html+++ b/frontend/src/app/shared/components/fields/edit/field-types/combined-date-edit-field.component.html@@ -3,5 +3,5 @@class="inline-edit--field op-input"(click)="onInputClick($event)"[value]="dates"- (focus)="showDatePickerModal()"+ (focus)="onInputFocused()"/>diff --git a/frontend/src/app/shared/components/fields/edit/field-types/date-picker-edit-field.component.ts b/frontend/src/app/shared/components/fields/edit/field-types/date-picker-edit-field.component.tsindex 7fcc019de50..790517898da 100644--- a/frontend/src/app/shared/components/fields/edit/field-types/date-picker-edit-field.component.ts+++ b/frontend/src/app/shared/components/fields/edit/field-types/date-picker-edit-field.component.ts@@ -59,7 +59,6 @@ export abstract class DatePickerEditFieldComponent extends EditFieldComponent im@InjectField() deviceService:DeviceService;- turboFrameSrc:string;opened = false;private createHandler:EventListener = this.handleSuccessfulCreate.bind(this);@@ -82,7 +81,6 @@ export abstract class DatePickerEditFieldComponent extends EditFieldComponent imngOnInit():void {super.ngOnInit();- this.turboFrameSrc = `${this.pathHelper.workPackageDatepickerDialogContentPath(this.change.id)}?field=${this.name}`;document.addEventListener('date-picker-modal:create', this.createHandler);document.addEventListener('date-picker-modal:update', this.updateHandler);@@ -97,6 +95,18 @@ export abstract class DatePickerEditFieldComponent extends EditFieldComponent imdocument.removeEventListener('date-picker-modal:cancel', this.cancelHandler);}+ public onInputFocused():void {+ this+ .change+ .getForm(true)+ .then(() => {+ this.showDatePickerModal();+ })+ .catch(() => {+ this.handler.deactivate(false);+ });+ }+public showDatePickerModal():void {this.opModalService.show(@@ -111,9 +121,9 @@ export abstract class DatePickerEditFieldComponent extends EditFieldComponent imif (this.opened) {this.onModalClosed();}- });+ });- this.opened = true;+ this.opened = true;});}