Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't show link to "File On Case" if activity is already linked to a case. #8

Merged
merged 2 commits into from
Jan 2, 2019
Merged

Don't show link to "File On Case" if activity is already linked to a case. #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30b1a07
Don't show 'File on Case' link for activities that are already linked…
mattwire Dec 17, 2018
0525059
Remove parameter that does not exist
mattwire Dec 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions CRM/Fastactivity/BAO/Activity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public static function getContactActivities(&$params) {
while ($dao->fetch()) {
$activityID = $dao->activity_id;
$values[$activityID]['activity_id'] = $dao->activity_id;
$values[$activityID]['source_record_id'] = $dao->source_record_id;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note, this just fixes a PHP notice

$values[$activityID]['activity_type_id'] = $dao->activity_type_id;
$values[$activityID]['activity_type'] = $activityTypes[$dao->activity_type_id];
$values[$activityID]['activity_date_time'] = $dao->activity_date_time;
Expand Down Expand Up @@ -523,6 +522,7 @@ private static function formatCaseLink($contactId, $caseId) {
'id' => $caseId,
));

$isClientOfCase = FALSE;
foreach ($caseContacts as $caseContactId) {
if (!isset($firstCaseContactId)) {
$firstCaseContactId = $caseContactId;
Expand Down Expand Up @@ -611,6 +611,17 @@ public static function actionLinks($activityTypeId, $activityId = NULL, $contact
}

list($activityTypeName, $activityTypeDescription) = CRM_Core_BAO_OptionValue::getActivityTypeDetails($activityTypeId);
$activityDetails = civicrm_api3('Activity', 'getsingle', [
'return' => ["activity_type_id", "case_id"],
'id' => $activityId,
]);

$activityTypeName = CRM_Core_PseudoConstant::getName('CRM_Activity_BAO_Activity', 'activity_type_id', $activityDetails['activity_type_id']);
// Don't offer a "File On Case" link if already added to a case.
$skipFileOnCase = FALSE;
if (!empty($activityDetails['case_id'])) {
$skipFileOnCase = TRUE;
}

$qs = "&reset=1&id=$activityId&cid=$contactId";
$qsView = "action=view{$qs}";
Expand Down Expand Up @@ -656,10 +667,8 @@ public static function actionLinks($activityTypeId, $activityId = NULL, $contact
}
}

if (
$activityTypeName &&
CRM_Case_BAO_Case::checkPermission($activityId, 'File On Case', $activityTypeId)
) {
if (!$skipFileOnCase && $activityTypeName &&
CRM_Case_BAO_Case::checkPermission($activityId, 'File On Case', $activityTypeId)) {
$actionLinks += array(
CRM_Core_Action::
ADD => array(
Expand Down