From a3c6f30f55d2ec98683a4ffae5e2b1302d5de5e5 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 29 Mar 2022 09:57:50 +0800 Subject: [PATCH 1/2] * Fix bug #21028,21030. --- module/user/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/user/model.php b/module/user/model.php index 69c1da87ee..5c6ceb0850 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -102,7 +102,7 @@ class userModel extends model ->beginIF(strpos($params, 'nodeleted') !== false or empty($this->config->user->showDeleted))->andWhere('deleted')->eq('0')->fi() ->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq($type)->fi() ->beginIF($accounts)->andWhere('account')->in($accounts)->fi() - ->beginIF($this->config->vision)->andWhere("CONCAT(',', visions, ',')")->like("%,{$this->config->vision},%")->fi() + ->beginIF($this->config->vision and $this->app->rawModule !== 'kanban')->andWhere("CONCAT(',', visions, ',')")->like("%,{$this->config->vision},%")->fi() ->orderBy($orderBy) ->beginIF($maxCount)->limit($maxCount)->fi() ->fetchAll($keyField); From 93d7e2dd1de2d3747494edc8260c51c76a007b14 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 29 Mar 2022 11:27:25 +0800 Subject: [PATCH 2/2] * Fix bug #14873. --- module/project/view/browsebylist.html.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php index 22057da690..bf18964ccd 100644 --- a/module/project/view/browsebylist.html.php +++ b/module/project/view/browsebylist.html.php @@ -14,14 +14,14 @@ .project-type-label.label-outline {width: 50px; min-width: 50px;} .project-type-label.label {overflow: unset !important; text-overflow: unset !important; white-space: unset !important;} -#projectTableList .project-name {position: relative; display: flex; align-items: center;} -#projectTableList .project-name > span, -#projectTableList .project-name > span {flex: none;} -#projectTableList .project-name > a {color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);} -#projectTableList .project-name.has-prefix > a, -#projectTableList .project-name.has-suffix > a {max-width: calc(100% - 100px);} -#projectTableList .project-name.has-prefix > a {padding-left: 5px;} -#projectTableList .project-name.has-suffix > a {padding-right: 5px;} +.project-name {position: relative; display: flex; align-items: center;} +.project-name > span, +.project-name > span {flex: none;} +.project-name > a {color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);} +.project-name.has-prefix > a, +.project-name.has-suffix > a {max-width: calc(100% - 100px);} +.project-name.has-prefix > a {padding-left: 5px;} +.project-name.has-suffix > a {padding-right: 5px;} .table-footer {z-index: 1;}