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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2018-01-16 10:29:02 +08:00
parent 64f7ac5c32 e55e97d7ff
commit 99ca9c0fe7
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+13 -13
View File
@@ -46,18 +46,18 @@ class task extends control
public function create($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $todoID = 0)
{
$task = new stdClass();
$task->module = $moduleID;
$task->assignedTo = '';
$task->name = '';
$task->story = $storyID;
$task->type = '';
$task->pri = '';
$task->estimate = '';
$task->desc = '';
$task->estStarted = '';
$task->deadline = '';
$task->mailto = '';
$task->color = '';
$task->module = $moduleID;
$task->assignedTo = '';
$task->name = '';
$task->story = $storyID;
$task->type = '';
$task->pri = '';
$task->estimate = '';
$task->desc = '';
$task->estStarted = '';
$task->deadline = '';
$task->mailto = '';
$task->color = '';
if($taskID > 0)
{
$task = $this->task->getByID($taskID);
@@ -784,7 +784,7 @@ class task extends control
}
$task = $this->view->task;
$members = $this->loadModel('user')->getPairs('noletter');
$members = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
$task->nextBy = $task->assignedTo;
$this->view->users = $members;
module/task/model.php
+2 -2
View File
@@ -2356,11 +2356,11 @@ class taskModel extends model
*/
public function getMemberPairs($task)
{
$users = $this->loadModel('user')->getPairs('noletter');
$users = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
$members = array('');
foreach($task->team as $member)
{
$members[$member->account] = $users[$member->account];
if(isset($users[$member->account])) $members[$member->account] = $users[$member->account];
}
return $members;
}
module/task/view/edit.html.php
+3 -3
View File
@@ -88,7 +88,7 @@
<?php endif;?>
<tr>
<th><?php echo $lang->task->assignedTo;?></th>
<td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?></span></td>
<td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?></span></td>
</tr>
<tr class='<?php echo empty($task->team) ? 'hidden' : ''?>' id='teamTr'>
<th><?php echo $lang->task->team;?></th>
@@ -198,7 +198,7 @@
<table class='table table-form'>
<?php foreach($task->team as $member):?>
<tr>
<td class='w-80px'><?php echo html::select("team[]", $users, $member->account, "class='form-control chosen'")?></td>
<td class='w-80px'><?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'")?></td>
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->task->estimate?></span>
@@ -217,7 +217,7 @@
<?php endforeach;?>
<?php for($i = 0; $i < 3; $i++):?>
<tr>
<td class='w-150px'><?php echo html::select("team[]", $users, '', "class='form-control chosen'")?></td>
<td class='w-150px'><?php echo html::select("team[]", $members, '', "class='form-control chosen'")?></td>
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->task->estimate?></span>