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

* Fix bug #21408,21406,20199.

Browse Source
This commit is contained in:
tanghucheng
2022-04-02 14:06:41 +08:00
parent d993fe3734
commit 1d168b0468
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extension/lite/project/ext/view/edit.lite.html.hook.php
View File

@@ -1,3 +0,0 @@
<script>
$('#plansBox').parent().remove();
</script>

2
module/doc/model.php
View File

@@ -1530,9 +1530,9 @@ class docModel extends model
{ {
$issueIdList = $this->dao->select('id')->from(TABLE_ISSUE)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get(); $issueIdList = $this->dao->select('id')->from(TABLE_ISSUE)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get();
$meetingIdList = $this->dao->select('id')->from(TABLE_MEETING)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get(); $meetingIdList = $this->dao->select('id')->from(TABLE_MEETING)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get();
$designIdList = $this->dao->select('id')->from(TABLE_DESIGN)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get();
} }
$designIdList = $this->dao->select('id')->from(TABLE_DESIGN)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get();
$executionIdList = $this->loadModel('execution')->getIdList($objectID); $executionIdList = $this->loadModel('execution')->getIdList($objectID);
$taskPairs = $this->dao->select('id')->from(TABLE_TASK)->where('execution')->in($executionIdList)->andWhere('deleted')->eq('0')->andWhere('execution')->in($this->app->user->view->sprints)->fetchPairs('id'); $taskPairs = $this->dao->select('id')->from(TABLE_TASK)->where('execution')->in($executionIdList)->andWhere('deleted')->eq('0')->andWhere('execution')->in($this->app->user->view->sprints)->fetchPairs('id');
if(!empty($taskPairs)) $taskIdList = implode(',', $taskPairs); if(!empty($taskPairs)) $taskIdList = implode(',', $taskPairs);

1
module/execution/css/task.css
View File

@@ -6,3 +6,4 @@ th.c-deadline {text-align: center;}
.c-estimate {text-align: right;} .c-estimate {text-align: right;}
.c-consumed {text-align: right;} .c-consumed {text-align: right;}
.c-left {text-align: right;} .c-left {text-align: right;}
.table-footer {z-index: 1;}

3
module/project/model.php
View File

@@ -120,7 +120,8 @@ class projectModel extends model
if(defined('TUTORIAL')) return $projectID; if(defined('TUTORIAL')) return $projectID;
if($projectID == 0 and $this->cookie->lastProject) $projectID = $this->cookie->lastProject; if($projectID == 0 and $this->cookie->lastProject) $projectID = $this->cookie->lastProject;
if($projectID == 0 and $this->session->project == '') $projectID = key($projects); if($projectID == 0 or $this->session->project == '') $projectID = key($projects);
$this->session->set('project', (int)$projectID, $this->app->tab); $this->session->set('project', (int)$projectID, $this->app->tab);
if(!isset($projects[$this->session->project])) if(!isset($projects[$this->session->project]))