Update location tokens for Contact to new apiv4 style

[eileenmcnaughton]

Overview

Update location tokens for Contact to new apiv4 style

Traditionally we have supported a token format that reflects the Query object / apiv3. During our last round of work on tokens we migrated the 'adverstised' token names to apiv4 style, while keeping the old ones working as deprecated tokens.

For the Contact tokens the internal workings use apiv4 now but the advertised tokens are apiv3 style. In addition the apiv4 style tokens that are also supported differed from what has since been added to apiv4

• Note 'advertised' refers to what is inserted if a selection from the dropdown is used (see screen shot after table)

Token Style	e.g	Is advertised before	is advertised after	works before	works after
legacy /query object	{contact.street_adddress}	Yes	No	Yes	Yes
abandoned style	{contact.primary_address.street_adddress}	No	No	Yes	Yes
apiv4 style	{contact.address_primary.street_adddress}	No	Yes	No	Yes

Before

After

Technical Details

Noting minor changes to the formatting of the legacy tokens

contact.on_hold goes from 0 to 'No'
contact.im_provider goes from a number to a label
contact.signature_html renders html-encoded in plain text mode

I think these are all obscure enough we shouldn't hit any issues (and the advertised ones do work)

Comments

[civibot]

(Standard links)

• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[colemanw]

Agree this is an improvement. I'm satisfied with the test coverage here. We ought to remove support for the "abandoned" style eventually.