Merge branch 'sprint/master_zhouxudong_17123' into 'master'

* Fix bug #17123.

See merge request easycorp/zentaopms!2672

module/task/js/batchcreate.js

@@ -113,8 +113,11 @@ function setPreview(num)
         });
 
         storyLink  = createLink('story', 'view', "storyID=" + storyID);
-        var concat = config.requestType != 'GET' ? '?'  : '&';
-        storyLink  = storyLink + concat + 'onlybody=yes';
+        if(!isonlybody)
+        {
+            var concat = config.requestType != 'GET' ? '?'  : '&';
+            storyLink  = storyLink + concat + 'onlybody=yes';
+        }
         $('#preview' + num).removeAttr('disabled');
         $('#preview' + num).attr('href', storyLink);
     }

module/task/view/batchcreate.html.php

@@ -14,6 +14,7 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('taskConsumed', $taskConsumed);?>
 <?php js::set('addChildTask', $lang->task->addChildTask);?>
+<?php js::set('isonlybody', isonlybody())?>
 <div id="mainContent" class="main-content fade">
   <div class="main-header clearfix">
     <h2 class="pull-left">
@@ -242,7 +243,11 @@
 .btn-toolbar > .dropdown {margin: 0px;}
 </style>
 <script>
-$(function(){parent.$('#triggerModal .modal-content .modal-header .close').hide();});
+$(function()
+{
+    parent.$('#triggerModal .modal-content .modal-header .close').hide();
+    $('#closeModal').on('click', function(){window.parent.$.closeModal();});
+});
 </script>
 <?php endif;?>
 <?php include '../../common/view/pastetext.html.php';?>