From db715a7d254db5ad95e54338b3fb96fd610b94f7 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@redhat.com>
Date: Thu, 5 Jun 2014 17:22:03 +0000
Subject: Bug 1019747: New user story field in Tracking product is getting
 copied from Description, not User Story when cloning

---
 enter_bug.cgi                                                       | 3 +++
 .../en/default/hook/bug/create/create-after_custom_fields.html.tmpl | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/enter_bug.cgi b/enter_bug.cgi
index 4866fdf28..4a3155e42 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -294,6 +294,9 @@ if ($cloned_bug_id) {
         $vars->{'comment_is_private'} = $isprivate;
     }
 
+    # BMO Bug 1019747
+    $vars->{'cloned_bug'} = $cloned_bug;
+
 } # end of cloned bug entry form
 
 else {
diff --git a/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl b/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl
index cd05d84de..594e854b1 100644
--- a/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl
+++ b/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl
@@ -20,14 +20,16 @@
           </span>
       </div>
       <div id="user_story_edit_container" class="bz_default_hidden">
-          [% INCLUDE global/textarea.html.tmpl
+        [% user_story_default = cloned_bug ? cloned_bug.cf_user_story : "" %]
+        [% INCLUDE global/textarea.html.tmpl
             name     = 'cf_user_story'
             id       = 'user_story'
             minrows  = 10
             maxrows  = 10
             cols     = constants.COMMENT_COLS
             disabled = 1
-          %]
+            defaultcontent = user_story_default
+        %]
       </div>
       <script type="text/javascript">
         var user_story_components = [];
-- 
cgit v1.2.3-24-g4f1b