* Finish task #47308.

doc/CHANGELOG

@@ -29,6 +29,7 @@
 30043 实现执行看板设置泳道高度功能
 30053 实现研发看板设置泳道高度功能
 30068 通用看板中默认的模版横向不要有滚动条
+
 2022-01-11 16.1
 46672 实现计划卡片的更多设置功能
 46671 计划看板中实现卡片的排序功能

module/kanban/lang/en.php

@@ -263,7 +263,6 @@ $lang->kanbanlane->heightTypeList['custom'] = 'Custom (Customize lane height bas
 $lang->kanbanlane->error = new stdclass();
 $lang->kanbanlane->error->mustBeInt = 'The number of cards must be a positive integer greater than 2.';
 
-
 $lang->kanbanregion = new stdclass();
 $lang->kanbanregion->name    = 'Region Name';
 $lang->kanbanregion->default = 'Default Region';

module/project/lang/en.php

@@ -155,8 +155,8 @@ $lang->project->etc                = " , etc";
 $lang->project->product            = 'Product';
 $lang->project->branch             = 'Branch';
 $lang->project->plan               = 'Plan';
-$lang->project->kanban             = 'Kanban';
 $lang->project->createKanban       = 'Create Kanban';
+$lang->project->kanban             = 'Kanban';
 
 /* Project Kanban. */
 $lang->project->typeList = array();

module/story/control.php

@@ -795,7 +795,9 @@ class story extends control
 
                 $product         = $this->product->getByID($productID);
                 $branchProduct   = $product->type == 'normal' ? false : true;
-                $modules         = array($productID => $this->tree->getOptionMenu($productID, 'story', 0, array_keys($branches)));
+                $modulePairs     = $this->tree->getOptionMenu($productID, 'story', 0, array_keys($branches));
+                $branchModules   = $branchProduct ? $modulePairs : array('0' => $modulePairs);
+                $modules         = array($productID => $branchModules);
                 $plans           = array($productID => $this->productplan->getBranchPlanPairs($productID, '', true));
                 $products        = array($productID => $product);
                 $branchTagOption = array($productID => $branchTagOption);