From 13cb08ff02f4fee4cf33463564bd24c8299de23e Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 21 Nov 2014 23:06:44 -0800 Subject: [PATCH] CRM-15578 - crmMailing2 - Set default test email address to current user --- CRM/Mailing/Info.php | 1 + js/angular-crmMailing2.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php index 21e6d36dcb..a713f81a74 100644 --- a/CRM/Mailing/Info.php +++ b/CRM/Mailing/Info.php @@ -133,6 +133,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info { 'mailTokens' => array_values($mailTokens), 'contactid' => $contactID, 'fromAddress' => array_values($fromAddress['values'][0]['api.OptionValue.get']['values']), + 'defaultTestEmail' => civicrm_api3('Contact', 'getvalue', array('id' => 'user_contact_id', 'return' => 'email')), 'visibility' => array( array('value' => 'Public Pages', 'label' => ts('Public Pages')), array('value' => 'User and User Admin Only', 'label' => ts('User and User Admin Only')), diff --git a/js/angular-crmMailing2.js b/js/angular-crmMailing2.js index 8176117639..1495fc78ea 100644 --- a/js/angular-crmMailing2.js +++ b/js/angular-crmMailing2.js @@ -141,7 +141,7 @@ // - mailing: object crmMailing2.controller('PreviewMailingCtrl', function ($scope, dialogService, crmMailingMgr) { $scope.ts = CRM.ts('CiviMail'); - $scope.testContact = {email: ''}; + $scope.testContact = {email: CRM.crmMailing.defaultTestEmail}; $scope.testGroup = {gid: null}; $scope.previewHtml = function previewHtml() { -- 2.25.1