* adjust for parent-child story.

2020-03-13 08:36:31 +08:00
parent beaa6ff0b2
commit fcfe033f28
19 changed files with 447 additions and 43 deletions
@@ -2008,7 +2008,11 @@ class project extends control
        }
        else
        {
-            $allStories = $this->story->getProductStories(array_keys($products), $branches, $moduleID = '0', $status = 'active');
+            $allStories = $this->story->getProductStories(array_keys($products), $branches, $moduleID = '0', $status = 'active', $pager = null, $hasParent = false);
+        }
+        foreach($allStories as $id => $story)
+        {
+            if(isset($prjStories[$story->id])) unset($allStories[$id]);
        }
        $prjStories = $this->story->getProjectStoryPairs($projectID);