Merge branch 'master' of https://github.com/easysoft/zentaopms

2020-09-21 09:42:24 +08:00
parent 81d2d87ca5 0f2633fcb3
commit 9297d89f3d
1 changed files with 1 additions and 1 deletions
@@ -56,7 +56,7 @@ class storyModel extends model
            foreach($plans as $planID => $plan)
            {
                $story->planTitle[$planID] = $plan->title;
-                if($plan->branch and !isset($story->stages[$plan->branch])) $story->stages[$plan->branch] = 'planned';
+                if($plan->branch and !isset($story->stages[$plan->branch]) and empty($story->branch)) $story->stages[$plan->branch] = 'planned';
            }
        }
        $extraStories = array();