From 3a86ec514dc3ea5989b13cbe2e8a0bdf3efdcf45 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sun, 15 Mar 2020 21:47:59 -0400 Subject: [PATCH] Cleanup api3 DashboardContact --- api/v3/DashboardContact.php | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/api/v3/DashboardContact.php b/api/v3/DashboardContact.php index fe1ceffc0b..1467d24f22 100644 --- a/api/v3/DashboardContact.php +++ b/api/v3/DashboardContact.php @@ -23,14 +23,6 @@ * @return array */ function civicrm_api3_dashboard_contact_create($params) { - if (empty($params['id'])) { - civicrm_api3_verify_one_mandatory($params, - NULL, - [ - 'dashboard_id', - ] - ); - } $errors = _civicrm_api3_dashboard_contact_check_params($params); if ($errors !== NULL) { return $errors; @@ -55,11 +47,11 @@ function civicrm_api3_dashboard_contact_get($params) { * * The metadata is used for setting defaults, documentation & validation. * - * @param array $params - * Array of parameters determined by getfields. + * @param array $fields + * Array of fields determined by getfields. */ -function _civicrm_api3_dashboard_contact_create_spec(&$params) { - unset($params['version']); +function _civicrm_api3_dashboard_contact_create_spec(&$fields) { + $fields['dashboard_id']['api.required'] = TRUE; } /** @@ -71,10 +63,9 @@ function _civicrm_api3_dashboard_contact_create_spec(&$params) { * @return array|null */ function _civicrm_api3_dashboard_contact_check_params(&$params) { - $dashboard_id = CRM_Utils_Array::value('dashboard_id', $params); - if ($dashboard_id) { + if (!empty($params['dashboard_id'])) { $allDashlets = CRM_Core_BAO_Dashboard::getDashlets(TRUE, $params['check_permissions'] ?? FALSE); - if (!isset($allDashlets[$dashboard_id])) { + if (!isset($allDashlets[$params['dashboard_id']])) { return civicrm_api3_create_error('Invalid or inaccessible dashboard ID'); } } @@ -84,9 +75,6 @@ function _civicrm_api3_dashboard_contact_check_params(&$params) { /** * Delete an existing dashboard-contact. * - * This method is used to delete any existing dashboard-board. the id of the dashboard-contact - * is required field in $params array - * * @param array $params * * @return array -- 2.25.1