From cb39cc9f08f61f3b1eb3428a3dccde2d8053e547 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Thu, 1 Dec 2016 17:33:45 +0800
Subject: [PATCH]  * adjust task #2784.

---
 module/project/control.php              |  6 ++----
 module/project/css/importtask.css       |  2 +-
 module/project/js/importtask.js         |  2 +-
 module/project/lang/en.php              |  1 -
 module/project/lang/zh-cn.php           |  1 -
 module/project/model.php                | 11 ++---------
 module/project/view/importtask.html.php |  8 --------
 7 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 40ba301867..bac73aeb53 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -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();
     }
diff --git a/module/project/css/importtask.css b/module/project/css/importtask.css
index 9c2bcbe15e..9c7db148a6 100644
--- a/module/project/css/importtask.css
+++ b/module/project/css/importtask.css
@@ -1,2 +1,2 @@
-#titlebar .input-group {position: relative; top: -6px; margin-left: 10px; width: 500px;}
+#titlebar .input-group {position: relative; top: -6px; margin-left: 10px; width: 300px;}
 #titlebar .input-group-addon, #titlebar .form-control {font-size: 12px; padding: 5px 10px; line-height: 18px; height: 30px}
diff --git a/module/project/js/importtask.js b/module/project/js/importtask.js
index 56e68cb51b..65cf6f7dbd 100644
--- a/module/project/js/importtask.js
+++ b/module/project/js/importtask.js
@@ -1,6 +1,6 @@
 function reload(toProject, fromProject)
 { 
-    link = createLink('project','importtask','toProject='+toProject + '&fromProject='+fromProject + '&containDoing=' + containDoing);
+    link = createLink('project','importtask','toProject='+toProject + '&fromProject='+fromProject);
     location.href = link;
 }
 $(function()
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 87de0512cc..60ab174de3 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -51,7 +51,6 @@ $lang->project->mine          = 'My Responsibility: ';
 $lang->project->other         = 'Other:';
 $lang->project->deleted       = 'Deleted';
 $lang->project->delayed       = 'Delayed';
-$lang->project->containDoing  = 'including doing project';
 
 $lang->project->start    = 'Start';
 $lang->project->activate = 'Activate';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 5601164db4..d107bc9ae9 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -51,7 +51,6 @@ $lang->project->mine          = '我负责：';
 $lang->project->other         = '其他：';
 $lang->project->deleted       = '已删除';
 $lang->project->delayed       = '已延期';
-$lang->project->containDoing  = '包含进行中的项目';
 
 $lang->project->start    = '开始';
 $lang->project->activate = '激活';
diff --git a/module/project/model.php b/module/project/model.php
index 679b9cb43e..ca1101d038 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -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;
     }
diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php
index 66cf2346a8..8957d6d75e 100644
--- a/module/project/view/importtask.html.php
+++ b/module/project/view/importtask.html.php
@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<?php js::set('containDoing', $containDoing);?>
 <div id='titlebar'>
   <div class='heading'>
     <span class='prefix pull-left'><?php echo html::icon($lang->icons['task']);?></span>
@@ -21,13 +20,6 @@
       <?php $projects = array(0 => $lang->project->allProjects) + $projects;?>
       <span class='input-group-addon'><?php echo $lang->project->selectProject;?></span>
       <?php  echo html::select('fromproject', $projects, $fromProject, "onchange='reload($projectID, this.value)' class='form-control chosen'");?>
-      <span class='input-group-btn'>
-      <?php
-      $toggleClass = $containDoing ? 'icon-checked' : 'icon-check-empty';
-      $params      = $containDoing ? "toProject=$projectID&fromProject=$fromProject" : "toProject=$projectID&fromProject=$fromProject&containDoing=true";
-      echo html::a($this->createLink('project', 'importTask', $params), "<i class={$toggleClass}></i> " . $lang->project->containDoing, '', "class='btn'");
-      ?>
-      </span>
     </div>
   </div>
 </div>