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

* Merge code.

Browse Source
This commit is contained in:
Yagami
2020-11-20 13:09:47 +08:00
parent f90a9dbe3d
commit 90df7cd4dc
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+2 -2
View File
@@ -445,7 +445,7 @@ class project extends control
$toProject = $project->id;
$branches = $this->project->getExecutionBranches($toProject);
$tasks = $this->project->getTasks2Imported($toProject, $branches);
$projects = $this->project->getProjectsToImport(array_keys($tasks));
$projects = $this->project->getExecutionsToImport(array_keys($tasks));
unset($projects[$toProject]);
unset($tasks[$toProject]);
@@ -2323,7 +2323,7 @@ class project extends control
$this->view->module = $module;
$this->view->method = $method;
$this->view->extra = $extra;
$this->view->projects = $this->project->getProjectsByProgram($project->project);
$this->view->projects = $this->project->getExecutionsByProject($project->project);
$this->display();
}