projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #8422 from colemanw/CRM-18586
[civicrm-core.git]
/
ang
/
crmMailingAB
/
EditCtrl.js
diff --git
a/ang/crmMailingAB/EditCtrl.js
b/ang/crmMailingAB/EditCtrl.js
index 914280125cb71d9a57d324a95a5675862a1460e9..b189bafcd78fab9f85afe99bf27ee9e1d28964bf 100644
(file)
--- a/
ang/crmMailingAB/EditCtrl.js
+++ b/
ang/crmMailingAB/EditCtrl.js
@@
-23,22
+23,26
@@
// TODO review fields exposed in UI and make sure the sync rules match
switch (abtest.ab.testing_criteria) {
case 'subject':
// TODO review fields exposed in UI and make sure the sync rules match
switch (abtest.ab.testing_criteria) {
case 'subject':
-
crmMailingMgr.mergeInto(abtest.mailings.b, abtest.mailings.a,
[
+
var exclude_subject =
[
'name',
'recipients',
'subject'
'name',
'recipients',
'subject'
- ]);
+ ];
+ crmMailingMgr.mergeInto(abtest.mailings.b, abtest.mailings.a, exclude_subject);
+ crmMailingMgr.mergeInto(abtest.mailings.c, abtest.mailings.a, exclude_subject);
break;
case 'from':
break;
case 'from':
-
crmMailingMgr.mergeInto(abtest.mailings.b, abtest.mailings.a,
[
+
var exclude_from =
[
'name',
'recipients',
'from_name',
'from_email'
'name',
'recipients',
'from_name',
'from_email'
- ]);
+ ];
+ crmMailingMgr.mergeInto(abtest.mailings.b, abtest.mailings.a, exclude_from);
+ crmMailingMgr.mergeInto(abtest.mailings.c, abtest.mailings.a, exclude_from);
break;
case 'full_email':
break;
case 'full_email':
-
crmMailingMgr.mergeInto(abtest.mailings.b, abtest.mailings.a,
[
+
var exclude_full_email =
[
'name',
'recipients',
'subject',
'name',
'recipients',
'subject',
@@
-48,13
+52,14
@@
'override_verp', // keep override_verp and replyto_Email linked
'body_html',
'body_text'
'override_verp', // keep override_verp and replyto_Email linked
'body_html',
'body_text'
- ]);
+ ];
+ crmMailingMgr.mergeInto(abtest.mailings.b, abtest.mailings.a, exclude_full_email);
+ crmMailingMgr.mergeInto(abtest.mailings.c, abtest.mailings.a, exclude_full_email);
break;
default:
throw "Unrecognized testing_criteria";
}
}
break;
default:
throw "Unrecognized testing_criteria";
}
}
- crmMailingMgr.mergeInto(abtest.mailings.c, abtest.mailings.a, ['name']);
return true;
};
return true;
};