Cleanup towards dev/core#2308

[eileenmcnaughton]

Overview

Cleanup towards https://lab.civicrm.org/dev/core/-/issues/2308

Before

More confusing

After

Less confusing

Technical Details

@demeritcowboy I removed the thing in here causing tests to fail - this might be a reasonable compromise between been worth doing some testing on but not too insane to read

Comments

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[demeritcowboy]

I started looking at this earlier and got sidetracked. I intend to review it.

[eileenmcnaughton]

Thanks @demeritcowboy - the goal of updating via import is a bit lower on my list now that I've discovered we can do what we wanted with search kit - but I still think this is pretty good clean up & I'll probably still chip away at it after this is merged

[demeritcowboy]

jenkins test this please

[demeritcowboy]

• General standards
  • [r-explain] PASS
  • [r-user] PASS
  • [r-doc] PASS
  • [r-run] PASS
• Developer standards
  • [r-tech] PASS
  • [r-code] PASS
  • [r-maint] PASS
  • [r-test] PASS

[eileenmcnaughton]

Thanks @demeritcowboy