From 831adbd64e970d43195eb1b5a6cedd67d3942eae Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 7 May 2016 16:59:06 -0400
Subject: [PATCH] CRM-18344 - Show attachments on CiviMail review panel

---
 ang/crmMailing/BlockReview.html              | 6 +++---
 ang/crmMailing/BlockReview.js                | 6 +++++-
 ang/crmMailing/EditMailingCtrl/2step.html    | 2 +-
 ang/crmMailing/EditMailingCtrl/wizard.html   | 2 +-
 ang/crmMailing/EditMailingCtrl/workflow.html | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ang/crmMailing/BlockReview.html b/ang/crmMailing/BlockReview.html
index 6a2e2aad3d..49b9232a64 100644
--- a/ang/crmMailing/BlockReview.html
+++ b/ang/crmMailing/BlockReview.html
@@ -1,6 +1,6 @@
 <!--
 Controller: EditMailingCtrl
-Required vars: mailing
+Required vars: mailing, attachments
 -->
 <div>
   <div class="crm-block" ng-form="reviewForm" crm-ui-id-scope>
@@ -24,15 +24,15 @@ Required vars: mailing
       <div crm-ui-field="{title: ts('Content')}">
         <span ng-show="mailing.body_html"><a crm-icon="fa-television" class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'html')">{{ts('HTML')}}</a></span>
         <span ng-show="mailing.body_html || mailing.body_text"><a crm-icon="fa-file-text-o" class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'text')">{{ts('Plain Text')}}</a></span>
-        <!-- TODO: attachments -->
       </div>
-      <div crm-ui-field="{title: ts('Attachments')}" ng-show="attachments.files.length > 0 || attachments.uploader.queue.length > 0">
+      <div crm-ui-field="{title: ts('Attachments')}">
         <div ng-repeat="file in attachments.files">
           <a ng-href="{{file.url}}" target="_blank">{{file.name}}</a>
         </div>
         <div ng-repeat="item in attachments.uploader.queue">
           {{item.file.name}}
         </div>
+        <div ng-show="!attachments.files.length && !attachments.uploader.queue.length"><em>{{ts('None')}}</em></div>
       </div>
       <div crm-ui-field="{title: ts('Tracking')}">
         <span crm-mailing-review-bool crm-on="mailing.url_tracking=='1'" crm-title="ts('Click-Throughs')"></span>
diff --git a/ang/crmMailing/BlockReview.js b/ang/crmMailing/BlockReview.js
index 1a0220f328..94968e3eb4 100644
--- a/ang/crmMailing/BlockReview.js
+++ b/ang/crmMailing/BlockReview.js
@@ -3,13 +3,17 @@
   angular.module('crmMailing').directive('crmMailingBlockReview', function (crmMailingPreviewMgr) {
     return {
       scope: {
-        crmMailing: '@'
+        crmMailing: '@',
+        crmMailingAttachments: '@'
       },
       templateUrl: '~/crmMailing/BlockReview.html',
       link: function (scope, elm, attr) {
         scope.$parent.$watch(attr.crmMailing, function(newValue){
           scope.mailing = newValue;
         });
+        scope.$parent.$watch(attr.crmMailingAttachments, function(newValue){
+          scope.attachments = newValue;
+        });
         scope.crmMailingConst = CRM.crmMailing;
         scope.ts = CRM.ts(null);
         scope.previewMailing = function previewMailing(mailing, mode) {
diff --git a/ang/crmMailing/EditMailingCtrl/2step.html b/ang/crmMailing/EditMailingCtrl/2step.html
index ea6bccc168..da35ce2bfe 100644
--- a/ang/crmMailing/EditMailingCtrl/2step.html
+++ b/ang/crmMailing/EditMailingCtrl/2step.html
@@ -43,7 +43,7 @@
       </div>
       <div crm-ui-wizard-step crm-title="ts('Review and Schedule')" ng-form="reviewForm">
         <div crm-ui-accordion="{title: ts('Review')}" >
-          <div crm-mailing-block-review crm-mailing="mailing"/>
+          <div crm-mailing-block-review crm-mailing="mailing" crm-mailing-attachments="attachments"/>
         </div>
         <div crm-ui-accordion="{title: ts('Schedule')}" >
           <div crm-mailing-block-schedule crm-mailing="mailing"/>
diff --git a/ang/crmMailing/EditMailingCtrl/wizard.html b/ang/crmMailing/EditMailingCtrl/wizard.html
index d8dbd1a342..01f35e4379 100644
--- a/ang/crmMailing/EditMailingCtrl/wizard.html
+++ b/ang/crmMailing/EditMailingCtrl/wizard.html
@@ -48,7 +48,7 @@
 
       <div crm-ui-wizard-step crm-title="ts('Review')" ng-form="reviewForm">
         <div crm-ui-accordion="{title: ts('Review')}" >
-          <div crm-mailing-block-review crm-mailing="mailing"/>
+          <div crm-mailing-block-review crm-mailing="mailing" crm-mailing-attachments="attachments"/>
         </div>
         <center>
           <a class="button crmMailing-submit-button" ng-click="submit()" ng-class="{blocking: block.check(), disabled: crmMailing.$invalid}">
diff --git a/ang/crmMailing/EditMailingCtrl/workflow.html b/ang/crmMailing/EditMailingCtrl/workflow.html
index e60779bde5..29c65908f1 100644
--- a/ang/crmMailing/EditMailingCtrl/workflow.html
+++ b/ang/crmMailing/EditMailingCtrl/workflow.html
@@ -44,7 +44,7 @@
 
       <div crm-ui-wizard-step="40" crm-title="ts('Review')" ng-form="schedForm" ng-if="checkPerm('schedule mailings') || checkPerm('access CiviMail')">
         <div crm-ui-accordion="{title: ts('Review')}" >
-          <div crm-mailing-block-review crm-mailing="mailing"/>
+          <div crm-mailing-block-review crm-mailing="mailing" crm-mailing-attachments="attachments"/>
         </div>
         <div crm-ui-accordion="{title: ts('Schedule')}" >
           <div crm-mailing-block-schedule crm-mailing="mailing"/>
-- 
2.25.1