Merge branch 'master' of https://github.com/easysoft/zentaopms

module/block/view/productstatisticblock.html.php

@@ -26,7 +26,7 @@
 .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 100px;}
 html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 90px;}
 .product-info .type-value,
-.product-info .type-label {font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+.product-info .type-label {font-size: 12px; overflow: visible; text-overflow: ellipsis; white-space: nowrap;}
 .product-info .type-value {font-size: 14px;}
 .product-info .type-value > strong {font-size: 20px; color: #3C4353;}
 .product-info .actions {position: absolute; left: 10px; top: 14px;}

module/bug/control.php

@@ -1591,6 +1591,7 @@ class bug extends control
             }
 
             if(!(in_array('platform', $productsType) or in_array('branch', $productsType))) unset($fields['branch']);// If products's type are normal, unset branch field.
+            if(isset($this->config->bizVersion)) list($fields, $bugs) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $bugs);
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $bugs);

module/product/control.php

@@ -739,6 +739,7 @@ class product extends control
                     if(strpos(",$checkedItem,", ",{$product->id},") === false) unset($productStats[$i]);
                 }
             }
+            if(isset($this->config->bizVersion)) list($fields, $productStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $productStats);
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $productStats);

module/project/control.php

@@ -2292,6 +2292,7 @@ class project extends control
                     if(strpos(",$checkedItem,", ",{$project->id},") === false) unset($projectStats[$i]);
                 }
             }
+            if(isset($this->config->bizVersion)) list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $projectStats);
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $projectStats);

module/story/control.php

@@ -1654,6 +1654,8 @@ class story extends control
             }
             if(!(in_array('platform', $productsType) or in_array('branch', $productsType))) unset($fields['branch']);// If products's type are normal, unset branch field.
 
+            if(isset($this->config->bizVersion)) list($fields, $stories) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $stories);
+
             $this->post->set('fields', $fields);
             $this->post->set('rows', $stories);
             $this->post->set('kind', 'story');

module/task/control.php

@@ -1490,6 +1490,7 @@ class task extends control
                     }
                 }
             }
+            if(isset($this->config->bizVersion)) list($fields, $tasks) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $tasks);
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $tasks);

module/testcase/control.php

@@ -1240,6 +1240,7 @@ class testcase extends control
                     $case->linkCase = join("; \n", $tmpLinkCases);
                 }
             }
+            if(isset($this->config->bizVersion)) list($fields, $cases) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $cases);
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $cases);

module/todo/control.php

@@ -528,6 +528,7 @@ class todo extends control
                 unset($todo->idvalue);
                 unset($todo->private);
             }
+            if(isset($this->config->bizVersion)) list($fields, $todos) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $todos);
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $todos);