Merge branch 'sprint/185_zxd_49296' into 'sprint/185'

* Finish task #49296.

See merge request easycorp/zentaopms!1860

module/story/control.php

@@ -342,6 +342,7 @@ class story extends control
         $this->view->pri              = $pri;
         $this->view->branch           = $branch;
         $this->view->branches         = $branches;
+        $this->view->stories          = $this->story->getParentStoryPairs($productID);
         $this->view->productID        = $productID;
         $this->view->product          = $product;
         $this->view->reviewers        = $this->user->getPairs('noclosed|nodeleted', '', 0, $reviewers);

module/story/view/create.html.php

@@ -149,7 +149,18 @@
           <?php if($type == 'story' and $this->config->URAndSR):?>
           <tr>
             <th><?php echo $lang->story->requirement;?></th>
-            <td colspan="4"><?php echo html::select('URS[]', $URS, '', "class='form-control chosen' multiple");?></td>
+            <td colspan="2"><?php echo html::select('URS[]', $URS, '', "class='form-control chosen' multiple");?></td>
+            <td colspan="2">
+              <div class='input-group' id='moduleIdBox'>
+                <div class="input-group-addon"><?php echo $lang->story->parent;?></div>
+                <?php echo html::select('parent', $stories, '', "class='form-control chosen'");?>
+              </div>  
+            </td>
+          </tr> 
+          <?php else:?>
+          <tr>
+            <th><?php echo $lang->story->parent;?></th>
+            <td colspan="4"><?php echo html::select('parent', $stories, '', "class='form-control chosen'");?></td>
           </tr>
           <?php endif;?>
           <tr>