Merge branch 'sprint/243_liugang_69594' into 'zentaopms_239'

Sprint/243 liugang 69594

See merge request easycorp/zentaopms!5430

module/product/control.php

@@ -1143,7 +1143,7 @@ class product extends control
 
         $programProducts = array();
 
-        $products = $this->app->tab == 'project' ? $this->product->getProducts($this->session->project) : $this->product->getList();
+        $products = $this->app->tab == 'project' ? $this->product->getProducts($this->session->project) : $this->product->getList(0, 'all', 0, 0, 'all');
 
         foreach($products as $product) $programProducts[$product->program][] = $product;
 

module/product/model.php

@@ -264,7 +264,7 @@ class productModel extends model
      */
     public function getList($programID = 0, $status = 'all', $limit = 0, $line = 0, $type = 'normal')
     {
-        return $this->dao->select('t1.id as id,t1.*')->from(TABLE_PRODUCT)->alias('t1')
+        $products = $this->dao->select('t1.*')->from(TABLE_PRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
             ->where('t1.deleted')->eq(0)
             ->beginIF($type == 'normal')->andWhere('t1.shadow')->eq(0)->fi()
@@ -289,6 +289,26 @@ class productModel extends model
             ->orderBy('t2.order_asc, t1.line_desc, t1.order_asc')
             ->beginIF($limit > 0)->limit($limit)->fi()
             ->fetchAll('id');
+
+        if($type == 'all')
+        {
+            $shadowProducts = array();
+            foreach($products as $product)
+            {
+                if($product->shadow) $shadowProducts[] = $product->id;
+            }
+            if($shadowProducts)
+            {
+                $shadowProducts = $this->dao->select('t1.id,t3.name')->from(TABLE_PRODUCT)->alias('t1')
+                    ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id=t2.product')
+                    ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t2.project=t3.id')
+                    ->where('t1.id')->in($shadowProducts)
+                    ->fetchPairs();
+                foreach($shadowProducts as $id => $name) $products[$id]->name = $name;
+            }
+        }
+
+        return $products;
     }
 
     /**
@@ -537,15 +557,8 @@ class productModel extends model
 
         if(empty($products)) return $products;
 
-        $lines          = $this->getLinePairs();
-        $productList    = array();
-        $productProject = $this->dao->select('t1.product,t1.project,t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
-            ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id')
-            ->where('t2.deleted')->eq('0')
-            ->andWhere('t2.type')->eq('project')
-            ->andWhere('t3.shadow')->eq('1')
-            ->fetchAll('product');
+        $lines       = $this->getLinePairs();
+        $productList = array();
 
         foreach($lines as $id => $name)
         {
@@ -557,8 +570,6 @@ class productModel extends model
                     $productList[] = $product;
                     unset($products[$key]);
                 }
-
-                if($product->shadow) $product->name = !empty($productProject[$product->id]->name) ? $productProject[$product->id]->name : $product->name;
             }
         }
 

module/testtask/lang/de.php

@@ -45,7 +45,7 @@ $lang->testtask->testingAB        = "Testing";
 $lang->testtask->blocked          = "Blockiert";
 $lang->testtask->done             = "Getestet";
 $lang->testtask->totalStatus      = "Alle";
-$lang->testtask->all              = "Alle " . $lang->productCommon;
+$lang->testtask->all              = 'Alle';
 $lang->testtask->allTasks         = 'Alle';
 $lang->testtask->collapseAll      = 'Zuklappen';
 $lang->testtask->expandAll        = 'Aufklappen';

module/testtask/lang/en.php

@@ -45,7 +45,7 @@ $lang->testtask->testingAB        = "Testing";
 $lang->testtask->blocked          = "Blocked";
 $lang->testtask->done             = "Tested";
 $lang->testtask->totalStatus      = "All";
-$lang->testtask->all              = "All " . $lang->productCommon . "s";
+$lang->testtask->all              = 'All';
 $lang->testtask->allTasks         = 'All Requests';
 $lang->testtask->collapseAll      = 'Collapse';
 $lang->testtask->expandAll        = 'Expand';

module/testtask/lang/fr.php

@@ -45,7 +45,7 @@ $lang->testtask->testingAB        = "Testing";
 $lang->testtask->blocked          = "Bloquée";
 $lang->testtask->done             = "Jouée";
 $lang->testtask->totalStatus      = "Toutes";
-$lang->testtask->all              = "Tous " . $lang->productCommon . "s";
+$lang->testtask->all              = 'Toutes';
 $lang->testtask->allTasks         = 'Toutes Recettes';
 $lang->testtask->collapseAll      = 'Replier';
 $lang->testtask->expandAll        = 'Déplier';

module/testtask/lang/vi.php

@@ -49,7 +49,7 @@ $lang->testtask->testing          = "Đang Test";
 $lang->testtask->blocked          = "Blocked";
 $lang->testtask->done             = "Đã test";
 $lang->testtask->totalStatus      = "Tất cả";
-$lang->testtask->all              = "Tất cả " . $lang->productCommon . "s";
+$lang->testtask->all              = 'Tất cả';
 $lang->testtask->allTasks         = 'Tất cả yêu cầu';
 $lang->testtask->collapseAll      = 'Co lại';
 $lang->testtask->expandAll        = 'Mở ra';

module/testtask/lang/zh-cn.php

@@ -45,7 +45,7 @@ $lang->testtask->testingAB        = "测试中";
 $lang->testtask->blocked          = "被阻塞测试单";
 $lang->testtask->done             = "已测测试单";
 $lang->testtask->totalStatus      = "全部";
-$lang->testtask->all              = "全部" . $lang->productCommon;
+$lang->testtask->all              = '所有';
 $lang->testtask->allTasks         = '所有测试';
 $lang->testtask->collapseAll      = '全部折叠';
 $lang->testtask->expandAll        = '全部展开';

module/testtask/lang/zh-tw.php

@@ -45,7 +45,7 @@ $lang->testtask->testingAB        = "測試中";
 $lang->testtask->blocked          = "被阻塞測試單";
 $lang->testtask->done             = "已測測試單";
 $lang->testtask->totalStatus      = "全部";
-$lang->testtask->all              = "全部" . $lang->productCommon;
+$lang->testtask->all              = '所有';
 $lang->testtask->allTasks         = '所有測試';
 $lang->testtask->collapseAll      = '全部摺疊';
 $lang->testtask->expandAll        = '全部展開';