Merge pull request #17283 from agh1/stop-icon-png

[civicrm-core.git] / ang / crmMailing / MsgTemplateCtrl.js

diff --git a/ang/crmMailing/MsgTemplateCtrl.js b/ang/crmMailing/MsgTemplateCtrl.js
index ebcd52e82f2e68ea5f5997fab2cf71c03e5e953b..5d200c3ffdd2c4321cfd9a3f1fad2d80b3996813 100644 (file)
--- a/ang/crmMailing/MsgTemplateCtrl.js
+++ b/ang/crmMailing/MsgTemplateCtrl.js
@@ -4,7 +4,7 @@
   angular.module('crmMailing').controller('MsgTemplateCtrl', function MsgTemplateCtrl($scope, crmMsgTemplates, dialogService) {
     var ts = $scope.ts = CRM.ts(null);
     $scope.crmMsgTemplates = crmMsgTemplates;
-
+    $scope.checkPerm = CRM.checkPerm;
     // @return Promise MessageTemplate (per APIv3)
     $scope.saveTemplate = function saveTemplate(mailing) {
       var model = {
@@ -22,7 +22,7 @@
         width: '40%',
         title: ts('Save Template')
       });
-      return dialogService.open('saveTemplateDialog', '~/crmMailing/dialog/saveTemplate.html', model, options)
+      return dialogService.open('saveTemplateDialog', '~/crmMailing/SaveMsgTemplateDialogCtrl.html', model, options)
         .then(function(item) {
           mailing.msg_template_id = item.id;
           return item;
@@ -33,6 +33,7 @@
     // @return Promise
     $scope.loadTemplate = function loadTemplate(mailing, id) {
       return crmMsgTemplates.get(id).then(function(tpl) {
+        mailing.msg_template_id = tpl.id;
         mailing.subject = tpl.msg_subject;
         mailing.body_text = tpl.msg_text;
         mailing.body_html = tpl.msg_html;