Merge branch dev/bug-64409 of zentao/zentaopms (#10679)

This commit is contained in:
刘刚
2025-07-30 16:53:21 +08:00
committed by Gitfox
5 changed files with 110 additions and 100 deletions
+2
View File
@@ -2120,6 +2120,8 @@ class execution extends control
public function storyKanban(int $executionID)
{
$this->app->loadLang('kanban');
$this->session->set('executionStoryBrowseType', 'unclosed');
$execution = $this->commonAction($executionID);
$executionID = $execution->id;
$stories = $this->loadModel('story')->getExecutionStories($executionID);
+27 -25
View File
@@ -83,31 +83,33 @@ $lang->productplan->confirmChangePlan = "After the branch of『%s』is unlinked
$lang->productplan->confirmRemoveStory = "After the branch of『%s』is unlinked, %s story under the branch will be removed from the plan at the same time, so still want to unassociate?";
$lang->productplan->confirmRemoveBug = "After the branch of『%s』is unlinked, %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
$lang->productplan->branch = 'Platform/Branch';
$lang->productplan->title = 'Titel';
$lang->productplan->desc = 'Beschreibung';
$lang->productplan->begin = 'Start';
$lang->productplan->end = 'Ende';
$lang->productplan->status = 'Status';
$lang->productplan->last = 'Letzter Plan';
$lang->productplan->future = 'Wartend';
$lang->productplan->stories = 'Storys';
$lang->productplan->bugs = 'Bugs';
$lang->productplan->hour = $lang->hourCommon;
$lang->productplan->execution = $lang->executionCommon;
$lang->productplan->parent = "Parent Plan";
$lang->productplan->parentAB = "Parent";
$lang->productplan->children = "Child Plan";
$lang->productplan->childrenAB = "C";
$lang->productplan->order = "Rank";
$lang->productplan->deleted = "Deleted";
$lang->productplan->mailto = "Mailto";
$lang->productplan->planStatus = "Status";
$lang->productplan->storyTitle = "Title";
$lang->productplan->createdBy = 'Created By';
$lang->productplan->createdDate = 'Created Date';
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
$lang->productplan->branch = 'Platform/Branch';
$lang->productplan->title = 'Titel';
$lang->productplan->desc = 'Beschreibung';
$lang->productplan->begin = 'Start';
$lang->productplan->end = 'Ende';
$lang->productplan->status = 'Status';
$lang->productplan->last = 'Letzter Plan';
$lang->productplan->future = 'Wartend';
$lang->productplan->stories = 'Storys';
$lang->productplan->bugs = 'Bugs';
$lang->productplan->hour = $lang->hourCommon;
$lang->productplan->execution = $lang->executionCommon;
$lang->productplan->parent = "Parent Plan";
$lang->productplan->parentAB = "Parent";
$lang->productplan->children = "Child Plan";
$lang->productplan->childrenAB = "C";
$lang->productplan->order = "Rank";
$lang->productplan->deleted = "Deleted";
$lang->productplan->mailto = "Mailto";
$lang->productplan->planStatus = "Status";
$lang->productplan->storyTitle = "Title";
$lang->productplan->createdBy = 'Created By';
$lang->productplan->createdDate = 'Created Date';
$lang->productplan->finishedDate = 'Finished Date';
$lang->productplan->closedDate = 'Closed Date';
$lang->productplan->statusList['wait'] = 'Wait';
$lang->productplan->statusList['doing'] = 'Doing';
+27 -25
View File
@@ -83,31 +83,33 @@ $lang->productplan->confirmChangePlan = "After the branch of『%s』is unlinked
$lang->productplan->confirmRemoveStory = "After the branch of『%s』is unlinked, %s story under the branch will be removed from the plan at the same time, so still want to unassociate?";
$lang->productplan->confirmRemoveBug = "After the branch of『%s』is unlinked, %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
$lang->productplan->branch = 'Platform/Branch';
$lang->productplan->title = 'Title';
$lang->productplan->desc = 'Description';
$lang->productplan->begin = 'Begin';
$lang->productplan->end = 'End';
$lang->productplan->status = 'Status';
$lang->productplan->last = 'Last Plan';
$lang->productplan->future = 'TBD';
$lang->productplan->stories = 'Story';
$lang->productplan->bugs = 'Bug';
$lang->productplan->hour = $lang->hourCommon;
$lang->productplan->execution = $lang->execution->common;
$lang->productplan->parent = "Parent Plan";
$lang->productplan->parentAB = "Parent";
$lang->productplan->children = "Child Plan";
$lang->productplan->childrenAB = "C";
$lang->productplan->order = "Order";
$lang->productplan->deleted = "Deleted";
$lang->productplan->mailto = "Mailto";
$lang->productplan->planStatus = "Status";
$lang->productplan->storyTitle = "Title";
$lang->productplan->createdBy = 'Created By';
$lang->productplan->createdDate = 'Created Date';
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
$lang->productplan->branch = 'Platform/Branch';
$lang->productplan->title = 'Title';
$lang->productplan->desc = 'Description';
$lang->productplan->begin = 'Begin';
$lang->productplan->end = 'End';
$lang->productplan->status = 'Status';
$lang->productplan->last = 'Last Plan';
$lang->productplan->future = 'TBD';
$lang->productplan->stories = 'Story';
$lang->productplan->bugs = 'Bug';
$lang->productplan->hour = $lang->hourCommon;
$lang->productplan->execution = $lang->execution->common;
$lang->productplan->parent = "Parent Plan";
$lang->productplan->parentAB = "Parent";
$lang->productplan->children = "Child Plan";
$lang->productplan->childrenAB = "C";
$lang->productplan->order = "Order";
$lang->productplan->deleted = "Deleted";
$lang->productplan->mailto = "Mailto";
$lang->productplan->planStatus = "Status";
$lang->productplan->storyTitle = "Title";
$lang->productplan->createdBy = 'Created By';
$lang->productplan->createdDate = 'Created Date';
$lang->productplan->finishedDate = 'Finished Date';
$lang->productplan->closedDate = 'Closed Date';
$lang->productplan->statusList['wait'] = 'Wait';
$lang->productplan->statusList['doing'] = 'Doing';
+27 -25
View File
@@ -83,31 +83,33 @@ $lang->productplan->confirmChangePlan = "After the branch of『%s』is unlinked
$lang->productplan->confirmRemoveStory = "After the branch of『%s』is unlinked, %s story under the branch will be removed from the plan at the same time, so still want to unassociate?";
$lang->productplan->confirmRemoveBug = "After the branch of『%s』is unlinked, %s bugs under the branch will be removed from the plan at the same time, so still want to unassociate?";
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
$lang->productplan->branch = 'Plateforme/Branche';
$lang->productplan->title = 'Titre';
$lang->productplan->desc = 'Description';
$lang->productplan->begin = 'Début';
$lang->productplan->end = 'Fin';
$lang->productplan->status = 'Status';
$lang->productplan->last = 'Dernier Plan';
$lang->productplan->future = 'A Définir';
$lang->productplan->stories = 'Story';
$lang->productplan->bugs = 'Bug';
$lang->productplan->hour = $lang->hourCommon;
$lang->productplan->execution = $lang->executionCommon;
$lang->productplan->parent = "Plan Parent";
$lang->productplan->parentAB = "Parent";
$lang->productplan->children = "Sous-Plan";
$lang->productplan->childrenAB = "C";
$lang->productplan->order = "Order";
$lang->productplan->deleted = "Deleted";
$lang->productplan->mailto = "Mailto";
$lang->productplan->planStatus = "Status";
$lang->productplan->storyTitle = "Title";
$lang->productplan->createdBy = 'Created By';
$lang->productplan->createdDate = 'Created Date';
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
$lang->productplan->branch = 'Plateforme/Branche';
$lang->productplan->title = 'Titre';
$lang->productplan->desc = 'Description';
$lang->productplan->begin = 'Début';
$lang->productplan->end = 'Fin';
$lang->productplan->status = 'Status';
$lang->productplan->last = 'Dernier Plan';
$lang->productplan->future = 'A Définir';
$lang->productplan->stories = 'Story';
$lang->productplan->bugs = 'Bug';
$lang->productplan->hour = $lang->hourCommon;
$lang->productplan->execution = $lang->executionCommon;
$lang->productplan->parent = "Plan Parent";
$lang->productplan->parentAB = "Parent";
$lang->productplan->children = "Sous-Plan";
$lang->productplan->childrenAB = "C";
$lang->productplan->order = "Order";
$lang->productplan->deleted = "Deleted";
$lang->productplan->mailto = "Mailto";
$lang->productplan->planStatus = "Status";
$lang->productplan->storyTitle = "Title";
$lang->productplan->createdBy = 'Created By';
$lang->productplan->createdDate = 'Created Date';
$lang->productplan->finishedDate = 'Finished Date';
$lang->productplan->closedDate = 'Closed Date';
$lang->productplan->statusList['wait'] = 'Wait';
$lang->productplan->statusList['doing'] = 'Doing';
+27 -25
View File
@@ -83,31 +83,33 @@ $lang->productplan->confirmChangePlan = "分支『%s』解除关联后,分支
$lang->productplan->confirmRemoveStory = "分支『%s』解除关联后,分支下的%s个需求将同步从计划中移除,是否解除?";
$lang->productplan->confirmRemoveBug = "分支『%s』解除关联后,分支下的%s个Bug将同步从计划中移除,是否解除?";
$lang->productplan->id = '编号';
$lang->productplan->product = '所属' . $lang->productCommon;
$lang->productplan->branch = '平台/分支';
$lang->productplan->title = '计划名称';
$lang->productplan->desc = '描述';
$lang->productplan->begin = '开始日期';
$lang->productplan->end = '结束日期';
$lang->productplan->status = '状态';
$lang->productplan->last = "上次计划";
$lang->productplan->future = '待定';
$lang->productplan->stories = "需求数";
$lang->productplan->bugs = 'Bug数';
$lang->productplan->hour = $lang->hourCommon;
$lang->productplan->execution = $lang->execution->common;
$lang->productplan->parent = "父计划";
$lang->productplan->parentAB = "父";
$lang->productplan->children = "子计划";
$lang->productplan->childrenAB = "子";
$lang->productplan->order = "排序";
$lang->productplan->deleted = "已删除";
$lang->productplan->mailto = "抄送给";
$lang->productplan->planStatus = "状态";
$lang->productplan->storyTitle = "需求名称";
$lang->productplan->createdBy = '由谁创建';
$lang->productplan->createdDate = '创建时间';
$lang->productplan->id = '编号';
$lang->productplan->product = '所属' . $lang->productCommon;
$lang->productplan->branch = '平台/分支';
$lang->productplan->title = '计划名称';
$lang->productplan->desc = '描述';
$lang->productplan->begin = '开始日期';
$lang->productplan->end = '结束日期';
$lang->productplan->status = '状态';
$lang->productplan->last = "上次计划";
$lang->productplan->future = '待定';
$lang->productplan->stories = "需求数";
$lang->productplan->bugs = 'Bug数';
$lang->productplan->hour = $lang->hourCommon;
$lang->productplan->execution = $lang->execution->common;
$lang->productplan->parent = "父计划";
$lang->productplan->parentAB = "父";
$lang->productplan->children = "子计划";
$lang->productplan->childrenAB = "子";
$lang->productplan->order = "排序";
$lang->productplan->deleted = "已删除";
$lang->productplan->mailto = "抄送给";
$lang->productplan->planStatus = "状态";
$lang->productplan->storyTitle = "需求名称";
$lang->productplan->createdBy = '由谁创建';
$lang->productplan->createdDate = '创建时间';
$lang->productplan->finishedDate = '完成时间';
$lang->productplan->closedDate = '关闭时间';
$lang->productplan->statusList['wait'] = '未开始';
$lang->productplan->statusList['doing'] = '进行中';