diff --git a/module/execution/model.php b/module/execution/model.php index eefd118e6f..3e778bb1d1 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -4622,7 +4622,6 @@ class executionModel extends model $burns = join(',', $execution->burns); echo ""; - if(!empty($execution->division)) echo "{$execution->productName}"; echo ""; if(common::hasPriv('execution', 'batchEdit')) echo "id class='table-nest-icon icon table-nest-toggle'>"; if($this->config->systemMode == 'new') @@ -4652,6 +4651,7 @@ class executionModel extends model } } } + if(!empty($execution->division)) echo "{$execution->productName}"; echo "" . zget($this->lang->project->statusList, $execution->status) . ''; echo '' . zget($users, $execution->PM) . ''; echo helper::isZeroDate($execution->begin) ? '' : '' . $execution->begin . ''; diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php index 58e6974ed6..52e39e31a9 100644 --- a/module/execution/view/view.html.php +++ b/module/execution/view/view.html.php @@ -331,7 +331,7 @@
execution->manageProducts;?> - id", '', '', "class='btn btn-link pull-right muted'");?> + type != 'stage') common::printLink('execution', 'manageproducts', "executionID=$execution->id", '', '', "class='btn btn-link pull-right muted'");?>
diff --git a/module/project/control.php b/module/project/control.php index 656ab48760..3b8bf8cca8 100644 --- a/module/project/control.php +++ b/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; diff --git a/module/project/css/execution.css b/module/project/css/execution.css index 4c3cddba23..71939a8e6b 100644 --- a/module/project/css/execution.css +++ b/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;} diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php index af18757430..c935de3512 100644 --- a/module/project/view/execution.html.php +++ b/module/project/view/execution.html.php @@ -77,7 +77,6 @@ - division) echo "{$lang->project->product}";?>
nameAB;?> @@ -86,6 +85,7 @@
+ division) echo "{$lang->project->product}";?> project->status;?> execution->owner;?> programplan->begin;?>