CRM-16407 - Report title entered on Title and Format tab is ignored by Create Report...

https://issues.civicrm.org/jira/browse/CRM-16407

diff --git a/templates/CRM/Report/Form/Tabs/Instance.tpl b/templates/CRM/Report/Form/Tabs/Instance.tpl
index 78cfc86dca95a11187427bc1a6bf7d09df8f2703..4985f013e9198395e31323ab36379401d30c28e8 100644 (file)
--- a/templates/CRM/Report/Form/Tabs/Instance.tpl
+++ b/templates/CRM/Report/Form/Tabs/Instance.tpl
@@ -149,6 +149,8 @@
         var $button = $(this),
           title = 'tr.crm-report-instanceForm-form-block-title',
           description = 'tr.crm-report-instanceForm-form-block-description';
+        $(title).find($("input[id='title']")).attr('value', $("input[id='title']").val());
+        $(description).find($("input[id='description']")).attr('value', $("input[id='description']").val());
         e.preventDefault();
         e.stopImmediatePropagation();
         CRM.confirm({
@@ -166,6 +168,12 @@
             $('[name=title]', '#' + formName).val($('[name=title]', this).val());
             $('[name=description]', '#' + formName).val($('[name=description]', this).val());
             $button.click();
+          })
+          .on('crmConfirm:no', function() {
+            $popUpTitle = $("div.crm-confirm-dialog input[id='title']")
+            $popUpDescription = $("div.crm-confirm-dialog input[id='description']")
+            $(title).find($("input[id='title']")).val($popUpTitle.val());
+            $(description).find($("input[id='description']")).val($popUpDescription.val());
           });
       }
     });