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

* code for task #49372.

Browse Source
This commit is contained in:
王怡栋
2022-02-23 09:55:38 +08:00
committed by 孙广明
parent e84d124450
commit 545ba95f90
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/project/ext/view/execution.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
<p>
<span class="text-muted"><?php echo $lang->execution->noExecution;?></span>
<?php if(common::hasPriv('execution', 'create')):?>
<?php echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->execution->createKanban, '', "class='btn btn-info' data-app='project'");?>
<?php echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->project->createKanban, '', "class='btn btn-info' data-app='project'");?>
<?php endif;?>
</p>
</div>
module/report/model.php
+2 -2
View File
@@ -311,8 +311,8 @@ class reportModel extends model
$project[$execution->projectname]['execution'][$name]['count'] = 0;
$project[$execution->projectname]['execution'][$name]['manhour'] = 0;
$workload[$member]['total']['count'] = 0;
$workload[$member]['total']['manhour'] = 0;
$workload[$member]['total']['count'] = 0;
$workload[$member]['total']['manhour'] = 0;
}
}
$workload[$member]['task']['project'] = $project;
module/task/model.php
+1 -1
View File
@@ -2497,7 +2497,7 @@ class taskModel extends model
$this->dao->update(TABLE_TASK)->data($data)->where('id')->eq($task->id)->exec();
if($task->parent > 0) $this->updateParentStatus($task->id);
if($task->story) $this->loadModel('story')->setStage($oldTask->story);
if($task->story) $this->loadModel('story')->setStage($task->story);
$oldTask = new stdClass();
$oldTask->consumed = $task->consumed;