From 5b964838ab5ea96feb50f33248ab959862f3a836 Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Mon, 17 Jan 2022 14:41:12 +0800 Subject: [PATCH 1/5] * fix closed stories not shown for lite vision, bug #18565. --- extension/lite/projectstory/ext/lang/zh-cn/lite.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extension/lite/projectstory/ext/lang/zh-cn/lite.php b/extension/lite/projectstory/ext/lang/zh-cn/lite.php index 5f60b3fe6b..89163e28fe 100644 --- a/extension/lite/projectstory/ext/lang/zh-cn/lite.php +++ b/extension/lite/projectstory/ext/lang/zh-cn/lite.php @@ -2,3 +2,5 @@ unset($lang->projectstory->featureBar['story']['changed']); unset($lang->projectstory->featureBar['story']['linkedExecution']); unset($lang->projectstory->featureBar['story']['unlinkedExecution']); +$lang->projectstory->featureBar['story']['closedstory'] = $lang->projectstory->featureBar['story']['closed']; +unset($lang->projectstory->featureBar['story']['closed']); From eab82f4aaf3bd520a2c46a8020c1513c554e5c55 Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Mon, 17 Jan 2022 14:45:45 +0800 Subject: [PATCH 2/5] * filter projects by vision in dropmenus, bug #18498. --- module/project/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/project/control.php b/module/project/control.php index a0645b14d4..31f8701868 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -110,6 +110,7 @@ class project extends control $projects = $this->dao->select('*')->from(TABLE_PROJECT) ->where('type')->eq('project') + ->beginIF($this->config->vision)->andWhere('vision')->eq($this->config->vision)->fi() ->andWhere('deleted')->eq(0) ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi() ->orderBy('order_asc') From 72abb75518c8bed4012ba58b5bedf2982a682307 Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Mon, 17 Jan 2022 15:30:41 +0800 Subject: [PATCH 3/5] * tweak project list, remove horizontal scrollbar, task #18500. --- module/project/css/browse.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/css/browse.css b/module/project/css/browse.css index d60f1258cc..91701de971 100644 --- a/module/project/css/browse.css +++ b/module/project/css/browse.css @@ -11,7 +11,7 @@ td.c-PM {white-space: nowrap; overflow: hidden;} .icon-cards-view {padding-left: 7px; font-size: 16px;} .icon-list {padding-left: 7px;} .panel-actions {position: relative; padding: 0 0;} -th.c-name {width: 260px !important;} +th.c-name {min-width: 240px;} @media screen and (min-width: 1460px) { th.c-name {width: auto;} From c32efc0929b1538361725e12cfdd56e1799b9a81 Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Mon, 17 Jan 2022 15:54:44 +0800 Subject: [PATCH 4/5] * filter executions by vision in blocks, bug #18518. --- module/project/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/project/model.php b/module/project/model.php index 884f88dd65..6595acbfb8 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1841,6 +1841,7 @@ class projectModel extends model ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') ->where('t1.type')->in('sprint,stage') ->beginIF($projectID != 0)->andWhere('t1.project')->eq($projectID)->fi() + ->beginIF($projectID == 0 && $this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi() ->beginIF(!empty($myExecutionIDList))->andWhere('t1.id')->in(array_keys($myExecutionIDList))->fi() ->beginIF($status == 'undone')->andWhere('t1.status')->notIN('done,closed')->fi() ->beginIF($status != 'all' and $status != 'undone' and $status != 'involved')->andWhere('t1.status')->eq($status)->fi() From f4e1da9d22cce5ec1240d0cc41c31c3ef2e3c92e Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Mon, 17 Jan 2022 16:53:20 +0800 Subject: [PATCH 5/5] * set project in story view menu by session, bug #18597. --- module/story/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/story/control.php b/module/story/control.php index 5e5179abae..92937bdc26 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1028,6 +1028,7 @@ class story extends control } elseif($from == 'project') { + if(empty($param)) $param = $this->session->project; $this->loadModel('project')->setMenu($param); } elseif($from == 'qa')