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

CRM-19380 allow for multiple from email addresses but only one per do… #9066

Merged
merged 3 commits into from
Oct 14, 2016

Conversation

seamuslee001
Copy link
Contributor

…main

@seamuslee001
Copy link
Contributor Author

@eileenmcnaughton thoughts Eileen?

@@ -258,15 +258,22 @@ public static function addOptionValue(&$params, &$groupParams, &$action, &$optio
* @param int $optionGroupID
* @param string $fieldName
* The name of the field in the DAO.
* @param bool $domainSpecific
* Dos this option groujp allow for duplicate options that are
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!! Dos this read right to you?:-)

@eileenmcnaughton
Copy link
Contributor

test this please

@seamuslee001
Copy link
Contributor Author

@eileenmcnaughton should this get merged?

@@ -177,10 +177,12 @@ public function buildQuickForm() {
'addressee',
)) && !$isReserved
) {
$domainSepcificOptionGroups = array('from_email_address');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sepcificallly.... this is a typo

@eileenmcnaughton
Copy link
Contributor

This seems to make sense - just adding the admin side of storing domain specific settings. Needs someone to give it a quick test though

@monishdeb
Copy link
Member

Tested. Merging

@monishdeb monishdeb merged commit 7a100ba into civicrm:master Oct 14, 2016
@seamuslee001 seamuslee001 deleted the CRM-19380 branch October 14, 2016 20:31
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.

4 participants