public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed bug - files/uploaded had wrong owner

Browse source 
Upgrade to React 16
This commit is contained in:
Tomas Bures 2018-12-26 04:38:02 +01:00
parent dce5ba7464
commit cfdcaf65d8
84 changed files with 2381 additions and 1546 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/models/files.js
View file

@ -25,7 +25,7 @@ function enforceTypePermitted(type, subType) {
}
function getFilePath(type, subType, entityId, filename) {
return path.join(path.join(filesDir, type, subType, entityId.toString()), filename);
return path.join(filesDir, type, subType, entityId.toString(), filename);
}
function getFileUrl(context, type, subType, entityId, filename) {

3
server/models/imports.js
View file

@ -11,7 +11,8 @@ const fs = require('fs-extra-promise');
const path = require('path');
const importer = require('../lib/importer');
const filesDir = path.join(__dirname, '..', 'files', 'imports');
const files = require('./files');
const filesDir = path.join(files.filesDir, 'imports');
const allowedKeysCreate = new Set(['name', 'description', 'source', 'settings']);
const allowedKeysUpdate = new Set(['name', 'description', 'mapping_type', 'mapping']);