From 72429d23f4f09e01819edeb57e8da4ca796f4021 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 12 Dec 2014 16:27:23 -0800
Subject: [PATCH] crmMailing2 - Debugging tweaks

These debug tweaks are useful for now... but should probably be removed
before 4.6.0.
---
 partials/crmMailing2/edit-unified.html  | 6 +++++-
 partials/crmMailing2/edit-unified2.html | 6 +++++-
 partials/crmMailing2/edit-wizard.html   | 6 +++++-
 partials/crmMailing2/edit.html          | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/partials/crmMailing2/edit-unified.html b/partials/crmMailing2/edit-unified.html
index 54b73963f3..3018792931 100644
--- a/partials/crmMailing2/edit-unified.html
+++ b/partials/crmMailing2/edit-unified.html
@@ -1,3 +1,7 @@
+<div crm-ui-accordion crm-title="ts('Debug')" crm-collapsed="true">
+  <pre>{{mailing|json}}</pre>
+</div>
+
 <form name="crmMailing2">
   <div class="crm-block crm-form-block crmMailing2">
 
@@ -37,7 +41,7 @@
     </div>
 
     <button ng-click="submit().then(leave)">{{ts('Submit Mailing')}}</button>
-    <button ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
+    <button ng-click="save()">{{ts('Save Draft')}}</button>
     <button crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to delete the draft mailing?')}" on-yes="delete().then(leave)">{{ts('Delete Draft')}}</button>
   </div>
 </form>
diff --git a/partials/crmMailing2/edit-unified2.html b/partials/crmMailing2/edit-unified2.html
index 017eca34ab..43c574f71f 100644
--- a/partials/crmMailing2/edit-unified2.html
+++ b/partials/crmMailing2/edit-unified2.html
@@ -1,3 +1,7 @@
+<div crm-ui-accordion crm-title="ts('Debug')" crm-collapsed="true">
+  <pre>{{mailing|json}}</pre>
+</div>
+
 <form name="crmMailing2">
   <div class="crm-block crm-form-block crmMailing2">
 
@@ -33,7 +37,7 @@
     </div>
 
     <button ng-click="submit().then(leave)">{{ts('Submit Mailing')}}</button>
-    <button ng-click="save().then(leave);">{{ts('Save Draft')}}</button>
+    <button ng-click="save()">{{ts('Save Draft')}}</button>
     <button crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to delete the draft mailing?')}" on-yes="delete().then(leave)">{{ts('Delete Draft')}}</button>
   </div>
 </form>
diff --git a/partials/crmMailing2/edit-wizard.html b/partials/crmMailing2/edit-wizard.html
index 884ea16fe3..17d5bc6c3e 100644
--- a/partials/crmMailing2/edit-wizard.html
+++ b/partials/crmMailing2/edit-wizard.html
@@ -1,3 +1,7 @@
+<div crm-ui-accordion crm-title="ts('Debug')" crm-collapsed="true">
+  <pre>{{mailing|json}}</pre>
+</div>
+
 <form name="crmMailing2">
   <div class="crm-block crm-form-block crmMailing2">
 
@@ -55,7 +59,7 @@
 
       <span crm-ui-wizard-buttons style="float:right;">
         <button crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to delete the draft mailing?')}" on-yes="delete().then(leave)">{{ts('Delete Draft')}}</button>
-        <button ng-click="save().then(leave);">{{ts('Save Draft')}}</button>
+        <button ng-click="save()">{{ts('Save Draft')}}</button>
       </span>
     </div>
   </div>
diff --git a/partials/crmMailing2/edit.html b/partials/crmMailing2/edit.html
index ee62f4719d..3ca2458869 100644
--- a/partials/crmMailing2/edit.html
+++ b/partials/crmMailing2/edit.html
@@ -55,7 +55,7 @@
 
       <span crm-ui-wizard-buttons style="float:right;">
         <button crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to delete the draft mailing?')}" on-yes="delete().then(leave)">{{ts('Delete Draft')}}</button>
-        <button ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
+        <button ng-click="save()">{{ts('Save Draft')}}</button>
       </span>
     </div>
   </div>
-- 
2.25.1