Merged in atrium-3780 (pull request civicrm#11)

seamuslee001 · seamuslee001 · commit 11f1e26e00f5 · 2015-12-10T10:15:35.000+11:00
Atrium 3780 and CRM-17650 CRM-17307 ensure replyto_email is updated when from is updated
diff --git a/ang/crmMailing/FromAddress.js b/ang/crmMailing/FromAddress.js
@@ -18,6 +18,7 @@
           var addr = crmFromAddresses.getByLabel(newValue);
           mailing.from_name = addr.author;
           mailing.from_email = addr.email;
+          mailing.replyto_email = addr.email;
         });
         // FIXME: Shouldn't we also be watching mailing.from_name and mailing.from_email?
       }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`var addr = crmFromAddresses.getByLabel(newValue);`
`19`	`19`	`mailing.from_name = addr.author;`
`20`	`20`	`mailing.from_email = addr.email;`
	`21`	`+ mailing.replyto_email = addr.email;`
`21`	`22`	`});`
`22`	`23`	`// FIXME: Shouldn't we also be watching mailing.from_name and mailing.from_email?`
`23`	`24`	`}`