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

[Import] Consolidate DataSource.tpl - template for first file on activity import #23456

Merged
merged 1 commit into from
May 26, 2022

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented May 13, 2022

Overview

Consolidate DataSource.tpl - template for first file on activity import

There are no substantive differences between the tpl used for Activity import compared with the one currenly shared by Contribution & Membership import

Before

image

After

image

Technical Details

I took a look at the activity DataSource.tpl and aside from minor
markup the only difference between it and the shared markup is
the absense of 'contactType' on the Activity form - so
I added an 'if'

Also - as suggested in the readme - onDuplicate is not used in the Activity import - it's just copy & paste so I removed from php & made it conditional in the tpl

Comments

@civibot
Copy link

civibot bot commented May 13, 2022

(Standard links)

@civibot civibot bot added the master label May 13, 2022
@eileenmcnaughton eileenmcnaughton force-pushed the import_more branch 2 times, most recently from 115c9b1 to 82565bb Compare May 18, 2022 04:14
@eileenmcnaughton eileenmcnaughton force-pushed the import_more branch 2 times, most recently from 6a0d4ee to 1dbabb5 Compare May 24, 2022 06:31
@eileenmcnaughton eileenmcnaughton changed the title Consolidate DataSource.tpl - template for first file on activity import [Import] Consolidate DataSource.tpl - template for first file on activity import May 25, 2022
I took a look at the activity DataSource.tpl and aside from minor
markup the only difference between it and the shared markup is
the absense of 'contactType' on the Activity form - so
I added an 'if'
@yashodha
Copy link
Contributor

@eileenmcnaughton looks good, merging this.

@yashodha yashodha merged commit 7c63299 into civicrm:master May 26, 2022
@eileenmcnaughton eileenmcnaughton deleted the import_more branch May 26, 2022 14:19
@eileenmcnaughton
Copy link
Contributor Author

thanks @yashodha !

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