Switch templates to use correctly named variable

[eileenmcnaughton]

Overview

Switch templates to use correctly named variable

Before

Use of {$activityTypeName} which confusing means label

After

Use of disambiguaion variable {$activityTypeNameAndLabel.label|escape}

Technical Details

@demeritcowboy if we do this we could 'amost' get rid of or change the mis-named variable. The gotcha is the case_activity work flow tpl - I have no idea how that is called. It should ideally use the token {activity.activity_type_id:label}

Comments

[civibot]

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷

Introduction for new contributors...

• If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
• A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
• A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
• If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
• Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
• A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
• To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
• For more information about contributing, see CONTRIBUTING.md.

Quick links for reviewers...

• ➡️ PR Demo site (can be rebuilt with the command test this please).
• 📖 Review standards
• 🗒️ Review template (brief or verbose)

➡️ Online demo of this PR 🔗

[demeritcowboy]

I will take a look, but to be honest, this isn't currently broken and is at least code-commented, and I'd rather spend time on the php 8 stuff. There is also the civicase extension to consider when reviewing these things.

For the workflow, I think you mean the message template called "Cases - Send Copy of an Activity", which is also used when sending to the assignee, both for case and non-case.

[demeritcowboy]

By "send a copy", it means when you use the "send a copy" section on a case activity.

[eileenmcnaughton]

@demeritcowboy aha - it happens here

civicrm-core/CRM/Case/BAO/Case.php

Lines 1407 to 1418 in a134b35

	[$result[$info['contact_id'] ?? NULL], $subject, $message, $html] = CRM_Core_BAO_MessageTemplate::sendTemplate(
	[
	'groupName' => 'msg_tpl_workflow_case',
	'workflow' => 'case_activity',
	'contactId' => $info['contact_id'] ?? NULL,
	'tplParams' => $tplParams,
	'from' => $receiptFrom,
	'toName' => $displayName,
	'toEmail' => $mail,
	'attachments' => $attachments,
	]
	);

I'm OK with not moving the workflow part into here - but it does look like that stuff assigns it's own $activityTypeName - it would be nice to remove that assign if possible just because it is so confusing & hurt my brain (again)