projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15412 from demeritcowboy/fly-backwards
[civicrm-core.git]
/
CRM
/
Core
/
Permission.php
diff --git
a/CRM/Core/Permission.php
b/CRM/Core/Permission.php
index 0e2a3c16af880a62fa6432171c3e4d93d45fb205..6623bfd1f38e03024addabe21dd79a836ab8a999 100644
(file)
--- a/
CRM/Core/Permission.php
+++ b/
CRM/Core/Permission.php
@@
-976,6
+976,7
@@
class CRM_Core_Permission {
$permissions['dedupe'] = [
'getduplicates' => ['access CiviCRM'],
$permissions['dedupe'] = [
'getduplicates' => ['access CiviCRM'],
+ 'getstatistics' => ['access CiviCRM'],
];
// CRM-16963 - Permissions for country.
];
// CRM-16963 - Permissions for country.
@@
-1183,6
+1184,11
@@
class CRM_Core_Permission {
$permissions['exception'] = [
'default' => ['merge duplicate contacts'],
];
$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'];
// Loc block is only used for events
$permissions['loc_block'] = $permissions['event'];