latest work #20

Merged
philipp merged 233 commits from dev into main 2020-12-09 18:49:33 +00:00
2 changed files with 4 additions and 5 deletions
Showing only changes of commit 4a9fd57356 - Show all commits

View File

@ -1,4 +1,4 @@
import { Entity, Column, OneToMany, ManyToOne, PrimaryGeneratedColumn, Generated, Unique } from "typeorm";
import { Entity, Column, OneToMany, ManyToOne, PrimaryGeneratedColumn, Generated, Unique, JoinTable, ManyToMany } from "typeorm";
import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsString, isUUID, } from "class-validator";
import { UserGroup } from './UserGroup';
@ -73,9 +73,8 @@ export class User {
/**
* groups
*/
// TODO: UserGroup implementation
// @OneToMany(() => UserGroup, usergroup => usergroup.)
@IsOptional()
@ManyToMany(() => UserGroup)
@JoinTable()
groups: UserGroup[];
/**

View File

@ -37,7 +37,7 @@ export abstract class UserGroup {
description: string;
/**
* Used to link users to a user group.
* TODO: Something about permission stuff
*/
// TODO:
// grouppermissions: GroupPermissions[];