Merge branch 'sprint/224_tianshujie_63692' into 'master'

Sprint/224 tianshujie 63692

See merge request easycorp/zentaopms!4866

module/task/js/batchcreate.js

@@ -128,7 +128,8 @@ function setStoryRelated(num)
  */
 function setPreview(num)
 {
-    var storyID = $('#story' + num).val();
+    var storyID   = $('#story' + num).val();
+    var storyLink = '#';
     if(storyID != 0  && storyID != 'ditto')
     {
         var link = createLink('story', 'ajaxGetInfo', 'storyID=' + storyID);
@@ -148,6 +149,7 @@ function setPreview(num)
             var concat = storyLink.indexOf('?') >= 0 ? '&' : '?';
             storyLink  = storyLink + concat + 'onlybody=yes';
         }
+
         $('#preview' + num).removeAttr('disabled');
         $('#preview' + num).modalTrigger({type:'iframe'});
         $('#preview' + num).css('pointer-events', 'auto');
@@ -155,7 +157,6 @@ function setPreview(num)
     }
     else
     {
-        storyLink  = '#';
         $('#preview' + num).attr('disabled', true);
         $('#preview' + num).css('pointer-events', 'none');
         $('#preview' + num).attr('href', storyLink);

module/task/view/batchcreate.html.php

@@ -118,7 +118,7 @@ $colspan = count($visibleFields) + 3;
           <tr>
             <td class='text-left c-id'><?php echo $i;?></td>
             <td class="<?php echo zget($visibleFields, 'module', 'hidden')?> moduleBox" style='overflow:visible'>
-              <?php echo html::select("module[$i]", $modules, $moduleID, "class='form-control chosen' onchange='setStories(this.value, $execution->id)'")?>
+              <?php echo html::select("module[$i]", $modules, $moduleID, "class='form-control chosen' onchange='setStories(this.value, $execution->id, $i)'")?>
               <?php echo html::hidden("parent[$i]", $parent);?>
             </td>
             <?php if($execution->lifetime != 'ops' and $execution->attribute != 'request' and $execution->attribute != 'review'):?>