Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/doc/model.php

@@ -2672,6 +2672,7 @@ EOT;
         $autoloadPage = true;
         if(!empty($doc) and $doc->type == 'url')
         {
+            if(!preg_match('/^https?:\/\//', $doc->content)) $doc->content = 'http://' . $doc->content;
             $parsedUrl = parse_url($doc->content);
             $urlPort   = isset($parsedUrl['port']) ? ':' . $parsedUrl['port'] : '';
             $urlDomain = $parsedUrl['host'] . $urlPort;

module/story/view/view.html.php

@@ -305,7 +305,7 @@
                   ?>
                   <td title='<?php echo $moduleTitle?>'><?php echo $printModule?></td>
                 </tr>
-                <?php if($story->type != 'requirement'):?>
+                <?php if($story->type != 'requirement' and $story->parent != -1):?>
                 <tr class='plan-line'>
                   <th><?php echo $lang->story->plan;?></th>
                   <td>