From a56adf5dc58a5a325d8be5a5605799b70841559d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 11 Dec 2014 22:02:09 -0800
Subject: [PATCH] attachments.html - Remove one level of indirection

---
 partials/crmMailing2/attachments.html   | 5 -----
 partials/crmMailing2/edit-unified.html  | 6 +++++-
 partials/crmMailing2/edit-unified2.html | 6 +++++-
 partials/crmMailing2/edit-wizard.html   | 6 +++++-
 partials/crmMailing2/edit.html          | 6 +++++-
 5 files changed, 20 insertions(+), 9 deletions(-)
 delete mode 100644 partials/crmMailing2/attachments.html

diff --git a/partials/crmMailing2/attachments.html b/partials/crmMailing2/attachments.html
deleted file mode 100644
index 107e6ae3e7..0000000000
--- a/partials/crmMailing2/attachments.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div
-  ng-controller="CrmAttachmentsCtrl"
-  ng-init="init(attachments)"
-  ng-include="partialUrl('../crmAttachment/attachments.html')">
-</div>
diff --git a/partials/crmMailing2/edit-unified.html b/partials/crmMailing2/edit-unified.html
index c236c168c3..48bd90b9fb 100644
--- a/partials/crmMailing2/edit-unified.html
+++ b/partials/crmMailing2/edit-unified.html
@@ -16,7 +16,11 @@
         <div ng-include="partialUrl('schedule.html')" />
       </div>
       <div crm-ui-tab id="tab-attachment" crm-title="ts('Attachments')">
-        <div ng-include="partialUrl('attachments.html')" />
+        <div
+          ng-controller="CrmAttachmentsCtrl"
+          ng-init="init(attachments)"
+          ng-include="partialUrl('../crmAttachment/attachments.html')">
+        </div>
       </div>
       <div crm-ui-tab id="tab-header" crm-title="ts('Header and Footer')">
         <div ng-include="partialUrl('headerFooter.html')" />
diff --git a/partials/crmMailing2/edit-unified2.html b/partials/crmMailing2/edit-unified2.html
index e9bd32c748..983ee5d207 100644
--- a/partials/crmMailing2/edit-unified2.html
+++ b/partials/crmMailing2/edit-unified2.html
@@ -14,7 +14,11 @@
       <div ng-include="partialUrl('headerFooter.html')" />
     </div>
     <div crm-ui-accordion id="tab-attachment" crm-title="ts('Attachments')" crm-collapsed='true'>
-      <div ng-include="partialUrl('attachments.html')" />
+      <div
+        ng-controller="CrmAttachmentsCtrl"
+        ng-init="init(attachments)"
+        ng-include="partialUrl('../crmAttachment/attachments.html')">
+      </div>
     </div>
     <div crm-ui-accordion id="tab-pub" crm-title="ts('Publication')" crm-collapsed='true'>
       <div ng-include="partialUrl('publication.html')" />
diff --git a/partials/crmMailing2/edit-wizard.html b/partials/crmMailing2/edit-wizard.html
index d0d438412d..df1cbbff48 100644
--- a/partials/crmMailing2/edit-wizard.html
+++ b/partials/crmMailing2/edit-wizard.html
@@ -19,7 +19,11 @@
           <div ng-include="partialUrl('headerFooter.html')" />
         </div>
         <div crm-ui-accordion crm-title="ts('Attachments')" crm-collapsed="true">
-          <div ng-include="partialUrl('attachments.html')" />
+          <div
+            ng-controller="CrmAttachmentsCtrl"
+            ng-init="init(attachments)"
+            ng-include="partialUrl('../crmAttachment/attachments.html')">
+          </div>
         </div>
         <div crm-ui-accordion crm-title="ts('Preview')">
           <div ng-include="partialUrl('preview.html')" />
diff --git a/partials/crmMailing2/edit.html b/partials/crmMailing2/edit.html
index 9384096464..3f27e41152 100644
--- a/partials/crmMailing2/edit.html
+++ b/partials/crmMailing2/edit.html
@@ -20,7 +20,11 @@
             </div>
           </div>
           <div crm-ui-tab id="tab-attachment" crm-title="ts('Attachments')">
-            <div ng-include="partialUrl('attachments.html')" />
+            <div
+              ng-controller="CrmAttachmentsCtrl"
+              ng-init="init(attachments)"
+              ng-include="partialUrl('../crmAttachment/attachments.html')">
+            </div>
           </div>
           <div crm-ui-tab id="tab-header" crm-title="ts('Header and Footer')">
             <div ng-include="partialUrl('headerFooter.html')" />
-- 
2.25.1