+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2016 |
+ | Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
* @throws \CiviCRM_API3_Exception
*/
function civicrm_api3_job_process_batch_merge($params) {
- $rule_group_id = CRM_Utils_Array::value('rgid', $params);
+ $rule_group_id = CRM_Utils_Array::value('rule_group_id', $params);
if (!$rule_group_id) {
$rule_group_id = civicrm_api3('RuleGroup', 'getvalue', array(
'contact_type' => 'Individual',
'used' => 'Unsupervised',
'return' => 'id',
+ 'options' => array('limit' => 1),
));
}
$gid = CRM_Utils_Array::value('gid', $params);
$mode = CRM_Utils_Array::value('mode', $params, 'safe');
$autoFlip = CRM_Utils_Array::value('auto_flip', $params, TRUE);
- $result = CRM_Dedupe_Merger::batchMerge($rule_group_id, $gid, $mode, $autoFlip, 1, 2, CRM_Utils_Array::value('criteria', $params, array()));
+ $result = CRM_Dedupe_Merger::batchMerge($rule_group_id, $gid, $mode, $autoFlip, 1, 2, CRM_Utils_Array::value('criteria', $params, array()), CRM_Utils_Array::value('check_permissions', $params));
return civicrm_api3_create_success($result, $params);
}
* @param $params
*/
function _civicrm_api3_job_process_batch_merge_spec(&$params) {
- $params['rgid'] = array(
+ $params['rule_group_id'] = array(
'title' => 'Dedupe rule group id, defaults to Contact Unsupervised rule',
'type' => CRM_Utils_Type::T_INT,
+ 'api.aliases' => array('rgid'),
);
$params['gid'] = array(
'title' => 'group id',
function civicrm_api3_job_group_rebuild($params) {
$lock = Civi::lockManager()->acquire('worker.core.GroupRebuild');
if (!$lock->isAcquired()) {
- throw new API_Exception('Could not acquire lock, another EmailProcessor process is running');
+ throw new API_Exception('Could not acquire lock, another GroupRebuild process is running');
}
$limit = CRM_Utils_Array::value('limit', $params, 0);