*Fix Bug #4516.

2018-07-11 10:21:05 +08:00
parent 2ff2e04f54
commit 39b0115f55
1 changed files with 13 additions and 2 deletions
@@ -1614,15 +1614,26 @@ class projectModel extends model
        {
            foreach($plans as $planID => $productID)
            {
-                $planStory = $this->loadModel('story')->getPlanStories($planID, 'active');
+                $planStory = $this->loadModel('story')->getPlanStories($planID);
                if(!empty($planStory))
                {
+                    $count = 0;
+                    foreach($planStory as $id => $story) 
+                    {
+                        if($story->status == 'draft') 
+                        {
+                            $count++;
+                            unset($planStory[$id]);
+                            continue;
+                        }
+                        $planProducts[$story->id] = $story->product;
+                    }
                    $planStories = array_merge($planStories, array_keys($planStory));
-                    foreach($planStory as $story) $planProducts[$story->id] = $story->product;
                }
            }
        }
        $this->linkStory($projectID, $planStories, $planProducts);
+        if($count != 0) die(js::confirm(sprintf($this->lang->project->haveDraft, $count), helper::createLink('project', 'create', "projectID=$projectID"))); 
    }

    /**