From f2cdd789da45c7ff71b235a1feeb03f454b5b55d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 27 Jan 2015 20:21:32 -0800
Subject: [PATCH] crmMailing - Load attachments using "resolve"
---
js/angular-crmMailing.js | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/js/angular-crmMailing.js b/js/angular-crmMailing.js
index c4f505560f..668cf554be 100644
--- a/js/angular-crmMailing.js
+++ b/js/angular-crmMailing.js
@@ -39,6 +39,12 @@
resolve: {
selectedMail: function($route, crmMailingMgr) {
return crmMailingMgr.get($route.current.params.id);
+ },
+ attachments: function($route, CrmAttachments) {
+ var attachments = new CrmAttachments(function () {
+ return {entity_table: 'civicrm_mailing', entity_id: $route.current.params.id};
+ });
+ return attachments.load();
}
}
});
@@ -61,12 +67,9 @@
$location.replace();
});
- angular.module('crmMailing').controller('EditMailingCtrl', function EditMailingCtrl($scope, selectedMail, $location, crmMailingMgr, crmStatus, CrmAttachments, crmMailingPreviewMgr, crmBlocker) {
+ angular.module('crmMailing').controller('EditMailingCtrl', function EditMailingCtrl($scope, selectedMail, $location, crmMailingMgr, crmStatus, attachments, crmMailingPreviewMgr, crmBlocker) {
$scope.mailing = selectedMail;
- $scope.attachments = new CrmAttachments(function () {
- return {entity_table: 'civicrm_mailing', entity_id: $scope.mailing.id};
- });
- $scope.attachments.load();
+ $scope.attachments = attachments;
$scope.crmMailingConst = CRM.crmMailing;
var ts = $scope.ts = CRM.ts(null);
--
2.25.1