Skip to content

Commit

Permalink
Merge branch 'note_redesign' into common_popup_buttons
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/app/child-dev-project/notes/note-details/note-details.component.html
#	src/app/child-dev-project/notes/note-details/note-details.component.ts
  • Loading branch information
TheSlimvReal committed Mar 23, 2023
2 parents 178024e + c6ed3be commit 3ec50fd
Showing 1 changed file with 0 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ export class NoteDetailsComponent implements OnInit {
toFormFieldConfig(field),
]);
middleForm = ["subject", "text"].map(toFormFieldConfig);
// TODO related entities is not necessarily set
// TODO make this configurable
bottomForm = ["children", "schools"].map(toFormFieldConfig);
form: EntityForm<Note>;
tmpEntity: Note;
Expand Down

0 comments on commit 3ec50fd

Please sign in to comment.