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

* Finish task #6302.

Browse Source
This commit is contained in:
Yagami
2019-09-02 16:45:34 +08:00
parent 5ee62cd458
commit 3fee807700
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+2 -1
View File
@@ -1755,6 +1755,7 @@ class projectModel extends model
$accounts = array_unique($accounts);
$limited = array_values($limited);
$oldJoin = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq((int)$projectID)->andWhere('type')->eq('project')->fetchPairs();
$this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$projectID)->andWhere('type')->eq('project')->exec();
foreach($accounts as $key => $account)
{
@@ -1768,7 +1769,7 @@ class projectModel extends model
$member->root = (int)$projectID;
$member->account = $account;
$member->join = helper::today();
$member->join = isset($oldJoin[$account]) ? $oldJoin[$account] : helper::today();
$member->type = 'project';
$this->dao->insert(TABLE_TEAM)->data($member)->exec();
module/project/view/team.html.php
+1 -1
View File
@@ -67,7 +67,7 @@
?>
</td>
<td title='<?php echo $member->role;?>'><?php echo $member->role;?></td>
<td><?php echo substr($member->join, 2);?></td>
<td><?php echo $member->join;?></td>
<td><?php echo $member->days . $lang->project->day;?></td>
<td><?php echo $member->hours . $lang->project->workHour;?></td>
<td><?php echo $memberHours . $lang->project->workHour;?></td>