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
2015-11-13 09:02:41 +08:00
parent 7891848534 f4ea06eddf
commit 886eefeca3
6 changed files with 87 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+7 -4
View File
@@ -351,21 +351,24 @@ class project extends control
die(js::locate(inlink('importTask', "toProject=$toProject&fromProject=$fromProject"), 'parent'));
}
$project = $this->commonAction($toProject);
$projects = $this->project->getProjectsToImport();
$project = $this->commonAction($toProject);
$branches = $this->project->getProjectBranches($toProject);
$tasks = $this->project->getTasks2Imported($branches);
$projects = $this->project->getProjectsToImport(array_keys($tasks));
unset($projects[$toProject]);
unset($tasks[$toProject]);
if($fromProject == 0)
{
$tasks2Imported = array();
foreach($projects as $id => $projectName)
{
$tasks2Imported = array_merge($tasks2Imported, $this->project->getTasks2Imported($id));
$tasks2Imported = array_merge($tasks2Imported, $tasks[$id]);
}
}
else
{
$tasks2Imported = $this->project->getTasks2Imported($fromProject);
$tasks2Imported = $tasks[$fromProject];
}
/* Save session. */