* adjust task #2784.

2016-12-01 17:33:45 +08:00
parent ffa9b017f0
commit cb39cc9f08
7 changed files with 6 additions and 25 deletions
@@ -1042,7 +1042,7 @@ class projectModel extends model
     * @access public
     * @return array
     */
-    public function getProjectsToImport($projectIds, $containDoing = 'false')
+    public function getProjectsToImport($projectIds)
    {
        $projects = $this->dao->select('*')->from(TABLE_PROJECT)
            ->where('id')->in($projectIds)
@@ -1054,14 +1054,7 @@ class projectModel extends model
        $now   = date('Y-m-d');
        foreach($projects as $id => $project)
        {
-            if($containDoing)
-            {
-                if($this->checkPriv($project) and ($project->status == 'done' or $project->status == 'doing' or $project->end < $now)) $pairs[$id] = ucfirst(substr($project->code, 0, 1)) . ':' . $project->name;
-            }
-            else
-            {
-                if($this->checkPriv($project) and ($project->status == 'done' or $project->end < $now)) $pairs[$id] = ucfirst(substr($project->code, 0, 1)) . ':' . $project->name;
-            }
+            if($this->checkPriv($project)) $pairs[$id] = ucfirst(substr($project->code, 0, 1)) . ':' . $project->name;
        }
        return $pairs;
    }