From c601dc9709aeaf5bf71f1c479c03698ecbcbbd0d Mon Sep 17 00:00:00 2001 From: joker-x Date: Sun, 30 Aug 2020 10:34:50 +0200 Subject: [PATCH] Fix --- server/models/campaigns.js | 2 -- server/models/lists.js | 4 ---- 2 files changed, 6 deletions(-) diff --git a/server/models/campaigns.js b/server/models/campaigns.js index 86768419..adc43a25 100644 --- a/server/models/campaigns.js +++ b/server/models/campaigns.js @@ -360,7 +360,6 @@ async function lockByIdTx(tx, id) { } async function rawGetByTx(tx, key, id) { - shares.enforceGlobalPermission(context, 'manageCampaigns'); const entity = await tx('campaigns').where('campaigns.' + key, id) .leftJoin('campaign_lists', 'campaigns.id', 'campaign_lists.campaign') .groupBy('campaigns.id') @@ -394,7 +393,6 @@ async function rawGetByTx(tx, key, id) { } async function getByIdTx(tx, context, id, withPermissions = true, content = Content.ALL) { - shares.enforceGlobalPermission(context, 'manageCampaigns'); await shares.enforceEntityPermissionTx(tx, context, 'campaign', id, 'view'); let entity = await rawGetByTx(tx, 'id', id); diff --git a/server/models/lists.js b/server/models/lists.js index 67ef8a71..851dce32 100644 --- a/server/models/lists.js +++ b/server/models/lists.js @@ -86,7 +86,6 @@ async function listWithSegmentByCampaignDTAjax(context, campaignId, params) { } async function getByIdTx(tx, context, id) { - shares.enforceGlobalPermission(context, 'manageLists'); await shares.enforceEntityPermissionTx(tx, context, 'list', id, 'view'); const entity = await tx('lists').where('id', id).first(); return entity; @@ -100,7 +99,6 @@ async function getById(context, id) { } async function getByIdWithListFields(context, id) { - shares.enforceGlobalPermission(context, 'manageLists'); return await knex.transaction(async tx => { const entity = await getByIdTx(tx, context, id); entity.permissions = await shares.getPermissionsTx(tx, context, 'list', id); @@ -110,7 +108,6 @@ async function getByIdWithListFields(context, id) { } async function getByCidTx(tx, context, cid) { - shares.enforceGlobalPermission(context, 'manageLists'); const entity = await tx('lists').where('cid', cid).first(); if (!entity) { shares.throwPermissionDenied(); @@ -127,7 +124,6 @@ async function getByCid(context, cid) { } async function getByNamespaceIdTx(tx, context, namespaceId) { - shares.enforceGlobalPermission(context, 'manageLists'); // FIXME - this methods is rather suboptimal if there are many lists. It quite needs permission caching in shares.js const rows = await tx('lists').where('namespace', namespaceId);