From 966f00c07a61a30d5a7f24a721d42e1df028d425 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Thu, 17 Feb 2022 14:58:59 +0800 Subject: [PATCH 1/2] * finish task #49421,49338. --- extension/lite/product/ext/view/browse.lite.html.hook.php | 6 ------ extension/lite/todo/ext/view/batchcreate.lite.html.hook.php | 2 ++ module/program/model.php | 1 + module/story/model.php | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 extension/lite/product/ext/view/browse.lite.html.hook.php diff --git a/extension/lite/product/ext/view/browse.lite.html.hook.php b/extension/lite/product/ext/view/browse.lite.html.hook.php deleted file mode 100644 index 6ac5e2da04..0000000000 --- a/extension/lite/product/ext/view/browse.lite.html.hook.php +++ /dev/null @@ -1,6 +0,0 @@ -app->rawModule == 'projectstory'):?> - - diff --git a/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php b/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php index 93373fe779..f9ced5a133 100644 --- a/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php +++ b/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php @@ -1,6 +1,8 @@ +';?> diff --git a/module/program/model.php b/module/program/model.php index df0c013409..6f886c80c2 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -133,6 +133,7 @@ class programModel extends model return $this->dao->select('*')->from(TABLE_PROGRAM) ->where('type')->in('program,project') ->andWhere('deleted')->eq(0) + ->andWhere('vision')->eq($this->config->vision) ->beginIF(!$this->app->user->admin) ->andWhere('(id')->in($this->app->user->view->programs) ->orWhere('id')->in($this->app->user->view->projects) diff --git a/module/story/model.php b/module/story/model.php index 37d1b07a71..dc2a1f3e46 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3982,9 +3982,9 @@ class storyModel extends model common::printIcon('story', 'recall', $vars, $story, 'list', 'back', 'hiddenwin', '', '', '', $this->lang->story->recall); common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); common::printIcon('story', 'edit', $vars . "&from=$story->from", $story, 'list', '', '', '', false, "data-group=$story->from"); - if($story->type != 'requirement') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'"); + if($story->type != 'requirement' and $this->config->vision != 'lite') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'"); if($this->app->rawModule != 'projectstory' OR $this->config->vision == 'lite') common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&storyID=$story->id", $story, 'list', 'split', '', '', '', '', $this->lang->story->subdivide); - if($this->app->rawModule == 'projectstory') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->project}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin'); + if($this->app->rawModule == 'projectstory' and $this->config->vision != 'lite') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->project}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin'); } else { From 172443d36ff9ad8310c83be5bc9afeb4aa48ab7e Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Thu, 17 Feb 2022 16:07:54 +0800 Subject: [PATCH 2/2] * Finish task #49342. --- extension/lite/product/ext/config/lite.php | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 extension/lite/product/ext/config/lite.php diff --git a/extension/lite/product/ext/config/lite.php b/extension/lite/product/ext/config/lite.php new file mode 100644 index 0000000000..14aec8c4a7 --- /dev/null +++ b/extension/lite/product/ext/config/lite.php @@ -0,0 +1,7 @@ +product->search['fields']['stage']); +unset($config->product->search['fields']['product']); +unset($config->product->search['fields']['plan']); +unset($config->product->search['fields']['source']); +unset($config->product->search['fields']['sourceNote']); +unset($config->product->search['fields']['fromBug']);