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

Revert

Browse source
This commit is contained in:
joker-x 2020-08-30 17:13:41 +02:00
parent a5cb0b6dd9
commit 136e73e28d
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/models/campaigns.js
View file

@ -68,7 +68,6 @@ function hash(entity, content) {
}
async function _listDTAjax(context, namespaceId, channelId, params) {
shares.enforceGlobalPermission(context, 'manageCampaigns');
return await dtHelpers.ajaxListWithPermissions(
context,
[{ entityTypeId: 'campaign', requiredOperations: ['view'] }],
@ -103,7 +102,6 @@ async function listByChannelDTAjax(context, channelId, params) {
}
async function listChildrenDTAjax(context, campaignId, params) {
shares.enforceGlobalPermission(context, 'manageCampaigns');
return await dtHelpers.ajaxListWithPermissions(
context,
[{ entityTypeId: 'campaign', requiredOperations: ['view'] }],
@ -117,7 +115,6 @@ async function listChildrenDTAjax(context, campaignId, params) {
async function listWithContentDTAjax(context, params) {
shares.enforceGlobalPermission(context, 'manageCampaigns');
return await dtHelpers.ajaxListWithPermissions(
context,
[{ entityTypeId: 'campaign', requiredOperations: ['view'] }],
@ -130,7 +127,6 @@ async function listWithContentDTAjax(context, params) {
}
async function listOthersWhoseListsAreIncludedDTAjax(context, campaignId, listIds, params) {
shares.enforceGlobalPermission(context, 'manageCampaigns');
return await dtHelpers.ajaxListWithPermissions(
context,
[{ entityTypeId: 'campaign', requiredOperations: ['view'] }],
@ -144,7 +140,6 @@ async function listOthersWhoseListsAreIncludedDTAjax(context, campaignId, listId
}
async function listTestUsersDTAjax(context, campaignId, params) {
shares.enforceGlobalPermission(context, 'manageCampaigns');
return await knex.transaction(async tx => {
await shares.enforceEntityPermissionTx(tx, context, 'campaign', campaignId, 'view');

1
server/models/lists.js
View file

@ -68,6 +68,7 @@ async function listByNamespaceDTAjax(context, namespaceId, params) {
}
async function listWithSegmentByCampaignDTAjax(context, campaignId, params) {
await shares.enforceEntityPermissionTx(tx, context, 'list', id, 'view');
return await dtHelpers.ajaxListWithPermissions(
context,
[{ entityTypeId: 'list', requiredOperations: ['view'] }],

3
server/models/shares.js
View file

@ -9,7 +9,6 @@ const interoperableErrors = require('../../shared/interoperable-errors');
const log = require('../lib/log');
const {getGlobalNamespaceId} = require('../../shared/namespaces');
const {getAdminId} = require('../../shared/users');
const { tUI } = require('../lib/translate');
// TODO: This would really benefit from some permission cache connected to rebuildPermissions
@ -451,7 +450,7 @@ async function regenerateRoleNamesTable() {
function throwPermissionDenied() {
throw new interoperableErrors.PermissionDeniedError(tUI('permissionDenied', config.defaultLanguage));
throw new interoperableErrors.PermissionDeniedError('Permission denied');
}
async function removeDefaultShares(tx, user) {