attachments.html - Remove one level of indirection

diff --git a/partials/crmMailing2/attachments.html b/partials/crmMailing2/attachments.html
deleted file mode 100644 (file)
index 107e6ae..0000000
--- 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 c236c168c32ef11f3a7887f3b48f222a88fc9cd0..48bd90b9fb2da3d8c388723d19eeda4338230363 100644 (file)
--- 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 e9bd32c7482df48018ba37ed0fc7254113ab3549..983ee5d207d464883b16e3f29794ba0581ef837c 100644 (file)
--- 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 d0d438412dbd184ae02467fc5e9b100daec7f506..df1cbbff486d428f3452d410a7754da6e9c09a1c 100644 (file)
--- 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 9384096464c705c7c97e34b33bd217bd82e6a0c5..3f27e41152954d29d0c0281775d29b48c00efffe 100644 (file)
--- 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')" />