yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add column id to user_permissions and group_permissions (#6181)

Browse Source 
* fix: add column id to user_permissions and group_permissions

* fix: don't drop ext

* fix: put back default value
This commit is contained in:
Apoorv Mishra
2023-11-21 13:16:57 +05:30
committed by GitHub
parent e2ad3f9e73
commit a891b6b604
4 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/models/GroupPermission.ts
View File

@@ -14,7 +14,7 @@ import Collection from "./Collection";
import Document from "./Document";
import Group from "./Group";
import User from "./User";
import Model from "./base/Model";
import ParanoidModel from "./base/ParanoidModel";
import Fix from "./decorators/Fix";
@Scopes(() => ({
@@ -40,7 +40,7 @@ import Fix from "./decorators/Fix";
}))
@Table({ tableName: "group_permissions", modelName: "group_permission" })
@Fix
class GroupPermission extends Model {
class GroupPermission extends ParanoidModel {
@Default(CollectionPermission.ReadWrite)
@IsIn([Object.values(CollectionPermission)])
@Column(DataType.STRING)

4
server/models/UserPermission.ts
View File

@@ -13,7 +13,7 @@ import { CollectionPermission } from "@shared/types";
import Collection from "./Collection";
import Document from "./Document";
import User from "./User";
import Model from "./base/Model";
import IdModel from "./base/IdModel";
import Fix from "./decorators/Fix";
@Scopes(() => ({
@@ -39,7 +39,7 @@ import Fix from "./decorators/Fix";
}))
@Table({ tableName: "user_permissions", modelName: "user_permission" })
@Fix
class UserPermission extends Model {
class UserPermission extends IdModel {
@Default(CollectionPermission.ReadWrite)
@IsIn([Object.values(CollectionPermission)])
@Column(DataType.STRING)