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 @@ config->systemMode);?> - +