Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
tianshujie98
2021-04-21 14:14:10 +08:00
parent c2e986dfac e692b32d55
commit 5b9dc62ae5
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/view/editlib.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
</tr>
<tr>
<th><?php echo $lang->doclib->control;?></th>
<?php if($lib->type == 'product' or $lib->type == 'execution' or ($config->systemMode == 'classic' and $lib->type != 'custom' )):?>
<?php if($lib->type == 'product' or $lib->type == 'execution' or ($config->systemMode == 'classic' and $lib->type != 'custom')):?>
<td>
<?php echo html::radio('acl', $lang->doclib->aclListA, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'")?>
<span class='text-info' id='noticeAcl'><?php echo $lang->doc->noticeAcl['lib'][$lib->type][$lib->acl];?></span>
module/product/view/all.html.php
+4 -2
View File
@@ -80,7 +80,7 @@
<?php foreach($program as $lineID => $line):?>
<?php if(isset($line['lineName'])):?>
<?php
if($this->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)
{
module/testcase/view/view.html.php
+1 -1
View File
@@ -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)
{