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

Merge branch '12.x'

Browse Source
This commit is contained in:
z
2020-10-30 16:58:47 +08:00
parent 1767bfe6ea 1bccfd5744
commit 5644b81408
153 changed files with 2002 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+8 -1
View File
@@ -38,6 +38,9 @@ class task extends control
*/
public function create($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $todoID = 0)
{
$projects = $this->project->getPairs('', $this->session->PRJ);
$projectID = $this->project->saveState($projectID, $projects);
$this->project->getLimitedProject();
$limitedProjects = !empty($_SESSION['limitedProjects']) ? $_SESSION['limitedProjects'] : '';
if(strpos(",{$limitedProjects},", ",$projectID,") !== false)
@@ -82,7 +85,7 @@ class task extends control
$storyLink = $this->session->storyList ? $this->session->storyList : $this->createLink('project', 'story', "projectID=$projectID");
/* Set menu. */
$this->project->setMenu($this->project->getPairs('', $this->session->PRJ), $project->id);
$this->project->setMenu($projects, $project->id);
if(!empty($_POST))
{
@@ -255,6 +258,10 @@ class task extends control
$taskConsumed = 0;
if($taskID) $taskConsumed = $this->dao->select('consumed')->from(TABLE_TASK)->where('id')->eq($taskID)->andWhere('parent')->eq(0)->fetch('consumed');
/* When common task are child tasks, query whether common task are consumed. */
$taskConsumed = 0;
if($taskID) $taskConsumed = $this->dao->select('consumed')->from(TABLE_TASK)->where('id')->eq($taskID)->andWhere('parent')->eq(0)->fetch('consumed');
if(!empty($_POST))
{
$mails = $this->task->batchCreate($projectID);