Merge remote-tracking branch 'origin/feat/assignment-page' into feat/assignment-page
# Conflicts: # frontend/src/views/assignments/UserAssignments.vue
This commit is contained in:
commit
e3ca01a730
1 changed files with 6 additions and 6 deletions
|
@ -1,8 +1,8 @@
|
|||
import {Cascade, Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property} from '@mikro-orm/core';
|
||||
import {Class} from '../classes/class.entity.js';
|
||||
import {Group} from './group.entity.js';
|
||||
import {Language} from '@dwengo-1/common/util/language';
|
||||
import {AssignmentRepository} from '../../data/assignments/assignment-repository.js';
|
||||
import { Cascade, Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core';
|
||||
import { Class } from '../classes/class.entity.js';
|
||||
import { Group } from './group.entity.js';
|
||||
import { Language } from '@dwengo-1/common/util/language';
|
||||
import { AssignmentRepository } from '../../data/assignments/assignment-repository.js';
|
||||
|
||||
@Entity({
|
||||
repository: () => AssignmentRepository,
|
||||
|
@ -34,7 +34,7 @@ export class Assignment {
|
|||
@OneToMany({
|
||||
entity: () => Group,
|
||||
mappedBy: 'assignment',
|
||||
cascade: [Cascade.ALL]
|
||||
cascade: [Cascade.ALL],
|
||||
})
|
||||
groups: Collection<Group> = new Collection<Group>(this);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue