* adjust task #2784.

This commit is contained in:
chenfeiCF
2016-12-01 17:33:45 +08:00
parent ffa9b017f0
commit cb39cc9f08
7 changed files with 6 additions and 25 deletions
+2 -4
View File
@@ -320,11 +320,10 @@ class project extends control
*
* @param int $projectID
* @param int $fromProject
* @param bool $containDoing
* @access public
* @return void
*/
public function importTask($toProject, $fromProject = 0, $containDoing = false)
public function importTask($toProject, $fromProject = 0)
{
if(!empty($_POST))
{
@@ -335,7 +334,7 @@ class project extends control
$project = $this->commonAction($toProject);
$branches = $this->project->getProjectBranches($toProject);
$tasks = $this->project->getTasks2Imported($toProject, $branches);
$projects = $this->project->getProjectsToImport(array_keys($tasks), $containDoing);
$projects = $this->project->getProjectsToImport(array_keys($tasks));
unset($projects[$toProject]);
unset($tasks[$toProject]);
@@ -362,7 +361,6 @@ class project extends control
$this->view->tasks2Imported = $tasks2Imported;
$this->view->projects = $projects;
$this->view->projectID = $project->id;
$this->view->containDoing = $containDoing;
$this->view->fromProject = $fromProject;
$this->display();
}