* Fix bug #29016,#29006,#29020.

module/execution/model.php

@@ -4622,7 +4622,6 @@ class executionModel extends model
 
         $burns = join(',', $execution->burns);
         echo "<tr $trAttrs class='$trClass'>";
-        if(!empty($execution->division)) echo "<td class='text-center' title='{$execution->productName}'>{$execution->productName}</td>";
         echo "<td class='c-name text-left flex sort-handler'>";
         if(common::hasPriv('execution', 'batchEdit')) echo "<span id=$execution->id class='table-nest-icon icon table-nest-toggle'></span>";
         if($this->config->systemMode == 'new')
@@ -4652,6 +4651,7 @@ class executionModel extends model
                 }
             }
         }
+        if(!empty($execution->division)) echo "<td class='text-center' title='{$execution->productName}'>{$execution->productName}</td>";
         echo "<td class='status-{$execution->status} text-center'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
         echo '<td>' . zget($users, $execution->PM) . '</td>';
         echo helper::isZeroDate($execution->begin) ? '<td class="c-date"></td>' : '<td class="c-date">' . $execution->begin . '</td>';

module/execution/view/view.html.php

@@ -331,7 +331,7 @@
             <div class="detail">
               <div class="detail-title">
                 <strong><?php echo $lang->execution->manageProducts;?></strong>
-                <?php if(common::hasPriv('execution', 'manageproducts')) common::printLink('execution', 'manageproducts', "executionID=$execution->id", '<i class="icon icon-more icon-sm"></i>', '', "class='btn btn-link pull-right muted'");?>
+                <?php if(common::hasPriv('execution', 'manageproducts') and $execution->type != 'stage') common::printLink('execution', 'manageproducts', "executionID=$execution->id", '<i class="icon icon-more icon-sm"></i>', '', "class='btn btn-link pull-right muted'");?>
               </div>
               <div class="detail-content">
                 <div class="row row-grid">

module/project/control.php

@@ -1048,11 +1048,12 @@ class project extends control
         foreach($executionStats as $execution)
         {
             $execution->productName = isset($productNameList[$execution->id]) ? $productNameList[$execution->id] : '';
-            if(!empty($execution->tasks) or !empty($execution->children))
+
+            if(!empty($execution->children))
             {
-                $showToggleIcon = true;
-                break;
+                foreach($execution->children as $childrenID => $children) $children->productName = isset($productNameList[$childrenID]) ? $productNameList[$childrenID] : '';
             }
+            if(!empty($execution->tasks) or !empty($execution->children)) $showToggleIcon = true;
         }
 
         $this->view->executionStats = $executionStats;

module/project/css/execution.css

@@ -13,7 +13,6 @@ th.table-nest-title .check-all {position: absolute; left: 15px; top: 7px;}
 #executionTableList > tr:not(.has-nest-child) .project-type-label {margin-left: 22px;}
 .table-statistic {padding-left: 10px;}
 td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: 0px;}
-th.c-name {width: 80px;}
 td.c-name > .project-type-label {flex: 0 0 36px; padding-right: 2px;}
 .c-name > a, .table-children .text-left > a, .c-name > span.text-ellipsis { padding-left: 5px; text-overflow: clip;}
 span.table-nest-icon.table-nest-toggle {min-width: 22px; max-width: 22px;}

module/project/view/execution.html.php

@@ -77,7 +77,6 @@
       <?php $vars = "status=$status&orderBy=%s";?>
       <thead>
         <tr>
-          <?php if($project->division) echo "<th class='c-name text-center'>{$lang->project->product}</th>";?>
           <th class='table-nest-title'>
             <div class="flex-between">
               <?php echo $lang->nameAB;?>
@@ -86,6 +85,7 @@
               <?php endif;?>
             </div>
           </th>
+          <?php if($project->division) echo "<th class='text-center'>{$lang->project->product}</th>";?>
           <th class='c-status text-center'><?php echo $lang->project->status;?></th>
           <th class='c-user'><?php echo $lang->execution->owner;?></th>
           <th class='c-date'><?php echo $lang->programplan->begin;?></th>