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.

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

dev/core#1116 - refactor/rename activityTypeName #15002

Merged

Conversation

demeritcowboy
Copy link
Contributor

@demeritcowboy demeritcowboy commented Aug 9, 2019

Overview

Continuation of #15032 which brings this back in line with #14972 but with naming changes

Before

Block of code is inside preProcess()

After

Block of code is on its own and has test. No changes were made inside the block that was moved.

Technical Details

Comments

Next steps:
Add in machineName and use it where needed.
Physically add some visual separation between displayName(for contact) and displayLabel(for activityType) so it's not confusing.

@civibot
Copy link

civibot bot commented Aug 9, 2019

(Standard links)

@civibot civibot bot added the master label Aug 9, 2019
@demeritcowboy demeritcowboy force-pushed the activity-type-assignment-1116 branch from 0d88289 to 45df174 Compare August 18, 2019 14:21
@demeritcowboy demeritcowboy force-pushed the activity-type-assignment-1116 branch from 45df174 to c6bbfc3 Compare August 18, 2019 14:25
@demeritcowboy demeritcowboy changed the title [Do not merge yet] dev/core#1116 - refactor/rename activityTypeName dev/core#1116 - refactor/rename activityTypeName Aug 18, 2019
@eileenmcnaughton
Copy link
Contributor

Looks good

@eileenmcnaughton eileenmcnaughton merged commit 605c4d7 into civicrm:master Aug 21, 2019
@demeritcowboy demeritcowboy deleted the activity-type-assignment-1116 branch August 21, 2019 21:41
@demeritcowboy
Copy link
Contributor Author

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants