diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php index f4ccade44e..49361eb4b7 100644 --- a/module/doc/view/editlib.html.php +++ b/module/doc/view/editlib.html.php @@ -43,7 +43,7 @@ doclib->control;?> - type == 'product' or $lib->type == 'execution' or ($config->systemMode == 'classic' and $lib->type != 'custom' )):?> + type == 'product' or $lib->type == 'execution' or ($config->systemMode == 'classic' and $lib->type != 'custom')):?> doclib->aclListA, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'")?> doc->noticeAcl['lib'][$lib->type][$lib->acl];?> diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 0806072497..82868a70a3 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -80,7 +80,7 @@ $line):?> config->systemMode == 'new') + if($this->config->systemMode == 'new' and $programID) { $trAttrs = "data-id='line.$lineID' data-parent='program.$programID'"; $trClass .= ' is-nest-child table-nest'; @@ -110,9 +110,11 @@ $trClass = ''; if($product->line) { + $path = "$product->line,$product->id"; + if($this->config->systemMode == 'new' and $product->program) $path = "$product->program,$path"; $trAttrs = "data-id='$product->id' data-parent='line.$product->line'"; $trClass .= ' is-nest-child table-nest'; - $trAttrs .= " data-nest-parent='line.$product->line' data-nest-path='line.$product->program,$product->line,$product->id'"; + $trAttrs .= " data-nest-parent='line.$product->line' data-nest-path='line.{$path}'"; } elseif($product->program) { diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 1ea15ba7a7..246eb73ade 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -177,7 +177,7 @@ foreach($modulePath as $key => $module) { - if($this->app->openApp == 'qa') + if($this->app->openApp == 'qa' || $this->app->openApp == 'ops') { if($isLibCase) {