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

Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x

Browse Source
This commit is contained in:
z
2020-11-17 14:13:16 +08:00
parent 4ec88c316d bb34dfe79b
commit 2c7eee240b
92 changed files with 526 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+3 -7
View File
@@ -738,16 +738,12 @@ class task extends control
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
$users = $this->loadModel('user')->getPairs('noletter');
$members = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
$assignedTo = in_array(zget($this->app->user->account, $users), $members) === TRUE ? $this->app->user->account : '';
$this->view->title = $this->view->project->name . $this->lang->colon .$this->lang->task->start;
$this->view->position[] = $this->lang->task->start;
$this->view->users = $users;
$this->view->members = $members;
$this->view->assignedTo = $task->assignedTo == '' ? $assignedTo : $task->assignedTo;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->members = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
$this->view->assignedTo = $task->assignedTo == '' ? $this->app->user->account : $task->assignedTo;
$this->display();
}
module/task/js/start.js
+4 -1
View File
@@ -11,7 +11,10 @@ function checkLeft()
alert(noticeTaskStart);
result = false;
}
else result = confirm(confirmFinish);
else
{
result = confirm(confirmFinish);
}
if(!result) setTimeout(function() {$.enableForm()}, 50);
return result;
}