Merge branch 'develop' of github.com:outline/outline into feat/mass-import

This commit is contained in:
Tom Moor
2020-12-22 20:43:58 -08:00
23 changed files with 333 additions and 181 deletions

View File

@@ -0,0 +1,14 @@
// @flow
import { Attachment, User } from "../models";
import policy from "./policy";
const { allow } = policy;
allow(User, "create", Attachment);
allow(User, "delete", Attachment, (actor, attachment) => {
if (!attachment || attachment.teamId !== actor.teamId) return false;
if (actor.isAdmin) return true;
if (actor.id === attachment.userId) return true;
return false;
});

View File

@@ -1,7 +1,8 @@
// @flow
import { Team, User, Collection, Document, Group } from "../models";
import { Attachment, Team, User, Collection, Document, Group } from "../models";
import policy from "./policy";
import "./apiKey";
import "./attachment";
import "./collection";
import "./document";
import "./integration";
@@ -24,7 +25,7 @@ type Policy = {
*/
export function serialize(
model: User,
target: Team | Collection | Document | Group
target: Attachment | Team | Collection | Document | Group
): Policy {
let output = {};