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

Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite

Browse Source
This commit is contained in:
王怡栋
2022-01-17 17:25:44 +08:00
parent d8577f7d28 f4e1da9d22
commit 0a619a470e
5 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extension/lite/projectstory/ext/lang/zh-cn/lite.php
View File

@@ -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']);

1
module/project/control.php
View File

@@ -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)
->andWhere('vision')->eq($this->config->vision)
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()

2
module/project/css/browse.css
View File

@@ -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;}

1
module/project/model.php
View File

@@ -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()

1
module/story/control.php
View File

@@ -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')