Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #47308.

Browse Source
This commit is contained in:
hufangzhou
2022-01-18 10:59:28 +08:00
parent 24de4b423c
commit afe5025006
5 changed files with 1609 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1604
db/standard/zentao16.2.sql Normal file
View File

File diff suppressed because it is too large Load Diff

1
doc/CHANGELOG
View File

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

1
module/kanban/lang/en.php
View File

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

2
module/project/lang/en.php
View File

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

4
module/story/control.php
View File

@@ -795,7 +795,9 @@ class story extends control
$product = $this->product->getByID($productID); $product = $this->product->getByID($productID);
$branchProduct = $product->type == 'normal' ? false : true; $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)); $plans = array($productID => $this->productplan->getBranchPlanPairs($productID, '', true));
$products = array($productID => $product); $products = array($productID => $product);
$branchTagOption = array($productID => $branchTagOption); $branchTagOption = array($productID => $branchTagOption);