From 4f4dfd990eae970ccc463ee6f61d98e11d21b564 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 30 Mar 2022 15:22:27 +0800
Subject: [PATCH] * Optimize code logic.

---
 module/execution/control.php        | 6 +++++-
 module/product/js/create.js         | 2 +-
 module/product/view/create.html.php | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 5a9484d256..b4b4af9ebf 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -3428,7 +3428,11 @@ class execution extends control
                 foreach($executionStats as $stage)
                 {
                     $stageList[] = $stage;
-                    foreach($stage->children as $child) $stageList[] = $child;
+                    foreach($stage->children as $child)
+                    {
+                        $child->name = $stage->name . '/' . $child->name;
+                        $stageList[] = $child;
+                    }
                 }
 
                 $executionStats = $stageList;
diff --git a/module/product/js/create.js b/module/product/js/create.js
index a7fc6677e8..f36e5643c6 100644
--- a/module/product/js/create.js
+++ b/module/product/js/create.js
@@ -1,6 +1,6 @@
 $(function()
 {
-    if(manageLine && (programID || systemMode == 'classic')) $('#line_chosen').addClass('hidden');
+    if(manageLinePriv && (programID || systemMode == 'classic')) $('#line_chosen').addClass('hidden');
     $('#lineName').css('border-left-color', '');
 })
 /**
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index 933f81b82b..f6ee68c235 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -15,7 +15,7 @@
 <?php js::set('noProject', false);?>
 <?php js::set('programID', $programID);?>
 <?php js::set('systemMode', $this->config->systemMode);?>
-<?php js::set('manageLine', common::hasPriv('product', 'manageLine'));?>
+<?php js::set('manageLinePriv', common::hasPriv('product', 'manageLine'));?>
 <div id="mainContent" class="main-content">
   <div class="center-block">
     <div class="main-header">