Skip to content

Commit

Permalink
Merge pull request #15227 from eileenmcnaughton/dedupe
Browse files Browse the repository at this point in the history
dev/core#1230 Permission nuancing, fix another place where merge duplicate contacts should be enough
  • Loading branch information
eileenmcnaughton authored Sep 6, 2019
2 parents 90d53fd + 5654496 commit 2434aaf
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CRM/Core/Permission.php
Original file line number Diff line number Diff line change
Expand Up @@ -1184,9 +1184,11 @@ public static function getEntityActionPermissions() {
$permissions['exception'] = [
'default' => ['merge duplicate contacts'],
];

$permissions['job'] = [
'process_batch_merge' => ['merge duplicate contacts'],
];
$permissions['rule_group']['get'] = [['merge duplicate contacts', 'administer CiviCRM']];
// Loc block is only used for events
$permissions['loc_block'] = $permissions['event'];

Expand Down

0 comments on commit 2434aaf

Please sign in to comment.