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

* Fix bug #38806.

Browse Source
This commit is contained in:
tanghucheng
2023-09-20 04:03:22 -04:00
parent fa8b2cebbd
commit 80295ca4d5
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+5 -1
View File
@@ -48,6 +48,10 @@ class commonModel extends model
{
global $app;
$rawModule = $app->rawModule;
$rawMethod = strtolower($app->rawMethod);
if($rawModule == 'marketresearch' and strpos($rawMethod, 'task') !== false) $rawModule = 'task';
if($rawModule == 'marketresearch' and strpos($rawMethod, 'stage') !== false) $rawModule = 'execution';
if($rawModule == 'task' or $rawModule == 'effort')
{
@@ -56,7 +60,7 @@ class commonModel extends model
$project = $this->syncProjectStatus($execution);
$this->syncProgramStatus($project);
}
if($rawModule == 'execution' or $rawModule == 'marketresearch')
if($rawModule == 'execution')
{
$executionID = $objectID;
$execution = $this->dao->select('id, project, grade, parent, status, deleted')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch();
module/program/model.php
+1 -1
View File
@@ -1388,7 +1388,7 @@ class programModel extends model
foreach($teamMembers as $projectID => $teamCount)
{
if(!isset($stats[$projectID])) $stats[$projectID] = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'teamCount' => 0);
if(!isset($stats[$projectID])) $stats[$projectID] = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'teamCount' => 0, 'totalConsumedNotDel' => 0, 'totalLeftNotDel' => 0);
$stats[$projectID]['teamCount'] = $teamCount;
}