Merge branch 'master_xieqiyu_fixbug' into 'master'

Master xieqiyu fixbug

See merge request easycorp/zentaopms!6754
This commit is contained in:
孙广明
2023-01-11 09:08:22 +00:00
4 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -385,7 +385,7 @@ if($this->app->tab == 'project') js::set('objectID', $projectID);
</form>
</div>
</div>
<?php js::set('bugModule', $lang->bug->module);?>
<?php if(empty($product->shadow)) js::set('bugModule', $lang->bug->module);?>
<?php js::set('bugExecution', $projectModel == 'kanban' ? $lang->bug->kanban : $lang->bug->execution);?>
<script>
$(function(){parent.$('body.hide-modal-close').removeClass('hide-modal-close');})
+2 -2
View File
@@ -218,13 +218,13 @@
<?php if(!$product->shadow):?>
<tr>
<th class='w-90px'><?php echo $lang->story->product;?></th>
<td><?php echo html::a($this->createLink('product', 'view', "productID=$story->product"), $product->name);?></td>
<td><?php echo html::a($this->createLink('product', 'view', "productID=$story->product"), $product->name, '', "data-app='product'");?></td>
</tr>
<?php endif;?>
<?php if($product->type != 'normal'):?>
<tr>
<th class='w-90px'><?php echo $lang->product->branch;?></th>
<td><?php common::printLink('product', 'browse', "productID=$story->product&branch=$story->branch", $branches[$story->branch]);?></td>
<td><?php common::printLink('product', 'browse', "productID=$story->product&branch=$story->branch", $branches[$story->branch], '', "data-app='product'");?></td>
</tr>
<?php endif;?>
<tr>
+1 -1
View File
@@ -276,7 +276,7 @@ foreach(explode(',', $config->testcase->create->requiredFields) as $field)
</div>
</div>
</div>
<?php js::set('caseModule', $lang->testcase->module)?>
<?php if(!$hiddenProduct) js::set('caseModule', $lang->testcase->module)?>
<script>
$(function()
{
+1 -1
View File
@@ -176,7 +176,7 @@
foreach($modulePath as $key => $module)
{
if($tab == 'qa' || $tab == 'ops' || $tab == 'product')
if($tab == 'qa' || $tab == 'ops')
{
if($isLibCase)
{