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

Merge branch 'sprint/wangyuting_flowbug' into 'master'

Browse Source 
* Fix build action menu bug.

See merge request easycorp/zentaopms!3338
This commit is contained in:
王怡栋
2022-05-11 08:18:09 +00:00
parent e16858d53d 3380222afc
commit d8d6b13d2b
16 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/view/view.html.php
+1 -1
View File
@@ -48,7 +48,7 @@ tbody tr td:first-child input {display: none;}
</div>
<?php if(!isonlybody()):?>
<div class='btn-toolbar pull-right'>
<?php echo $this->buildOperateMenu($build, 'view');?>
<?php echo $this->build->buildOperateMenu($build, 'view');?>
</div>
<?php endif;?>
</div>
module/caselib/view/browse.html.php
+1 -1
View File
@@ -157,7 +157,7 @@ js::set('flow', $config->global->flow);
<td class='<?php if(isset($run)) echo $run->status;?> testcase-<?php echo $case->status?>'> <?php echo $this->processStatus('testcase', $case);?></td>
<?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $case) . "</td>";?>
<td class='c-actions'>
<?php echo $this->buildOperateMenu($case, 'browse');?>
<?php echo $this->caselib->buildOperateMenu($case, 'browse');?>
</td>
</tr>
<?php endforeach;?>
module/caselib/view/view.html.php
+1 -1
View File
@@ -39,7 +39,7 @@
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php echo "<div class='divider'></div>";?>
<?php echo $this->buildOperateMenu($lib, 'view');?>
<?php echo $this->caselib->buildOperateMenu($lib, 'view');?>
</div>
</div>
</div>
module/execution/view/view.html.php
+1 -1
View File
@@ -148,7 +148,7 @@
<div class="btn-toolbar">
<?php $browseLink = $this->session->executionList ? $this->session->executionList : inlink('browse', "executionID=$execution->id");?>
<?php common::printBack($browseLink);?>
<?php echo $this->buildOperateMenu($execution, 'view');?>
<?php echo $this->execution->buildOperateMenu($execution, 'view');?>
</div>
</div>
</div>
module/product/view/all.html.php
+1 -1
View File
@@ -214,7 +214,7 @@
<td><?php echo $product->plans;?></td>
<td><?php echo $product->releases;?></td>
<?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $product) . "</td>";?>
<td class='c-actions sort-handler'><?php echo $this->buildOperateMenu($product, 'browse');?></td>
<td class='c-actions sort-handler'><?php echo $this->product->buildOperateMenu($product, 'browse');?></td>
</tr>
<?php endforeach;?>
<?php endif;?>
module/product/view/view.html.php
+1 -1
View File
@@ -161,7 +161,7 @@
$browseLink = $this->session->productList ? $this->session->productList : inlink('browse', "productID=$product->id");
common::printBack($browseLink);
if(!$product->deleted) echo $this->buildOperateMenu($product, 'view');
if(!$product->deleted) echo $this->product->buildOperateMenu($product, 'view');
?>
</div>
</div>
module/productplan/view/browsebylist.html.php
+1 -1
View File
@@ -144,7 +144,7 @@
<div title='<?php echo $desc;?>'><?php echo nl2br($desc);?></div>
</td>
<?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $plan) . "</td>";?>
<td class='c-actions'><?php echo $this->buildOperateMenu($plan, 'browse'); ?></td>
<td class='c-actions'><?php echo $this->productplan->buildOperateMenu($plan, 'browse'); ?></td>
</tr>
<?php endforeach;?>
</tbody>
module/productplan/view/view.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
</div>
</div>
<div class='btn-toolbar pull-right' id='actionsBox'>
<?php if(!$plan->deleted && !isonlybody()) echo $this->buildOperateMenu($plan, 'view'); ?>
<?php if(!$plan->deleted && !isonlybody()) echo $this->productplan->buildOperateMenu($plan, 'view'); ?>
</div>
</div>
<div id='mainContent' class='main-content'>
module/project/view/view.html.php
+1 -1
View File
@@ -98,7 +98,7 @@
<div class="btn-toolbar">
<?php $browseLink = $this->session->projectList ? $this->session->projectList : inlink('browse');?>
<?php common::printBack($browseLink);?>
<?php echo $this->buildOperateMenu($project, 'view');?>
<?php echo $this->project->buildOperateMenu($project, 'view');?>
</div>
</div>
</div>
module/story/view/view.html.php
+1 -1
View File
@@ -200,7 +200,7 @@
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!isonlybody()) echo "<div class='divider'></div>";?>
<?php if(!$story->deleted) echo $this->buildOperateMenu($story, 'view');?>
<?php if(!$story->deleted) echo $this->story->buildOperateMenu($story, 'view');?>
</div>
</div>
</div>
module/task/view/view.html.php
+1 -1
View File
@@ -170,7 +170,7 @@
<?php common::printBack($browseLink);?>
<?php if(!isonlybody()) echo "<div class='divider'></div>";?>
<?php $task->executionList = $execution;?>
<?php echo $this->buildOperateMenu($task, 'view');?>
<?php echo $this->task->buildOperateMenu($task, 'view');?>
</div>
</div>
</div>
module/testcase/view/view.html.php
+1 -1
View File
@@ -116,7 +116,7 @@
<?php $case->isLibCase = $isLibCase;?>
<?php $case->caseFails = $caseFails;?>
<?php $case->runID = $runID;?>
<?php echo $this->buildOperateMenu($case, 'view');?>
<?php echo $this->testcase->buildOperateMenu($case, 'view');?>
</div>
</div>
</div>
module/testsuite/view/browse.html.php
+1 -1
View File
@@ -70,7 +70,7 @@
<td><?php echo $suite->addedDate;?></td>
<?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $suite) . "</td>";?>
<td class='c-actions'>
<?php echo $this->buildOperateMenu($suite, 'browse');?>
<?php echo $this->testsuite->buildOperateMenu($suite, 'browse');?>
</td>
</tr>
<?php endforeach;?>
module/testsuite/view/view.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
<?php
if(!$suite->deleted and $canBeChanged)
{
echo $this->buildOperateMenu($suite, 'view');
echo $this->testsuite->buildOperateMenu($suite, 'view');
}
?>
</div>
module/testtask/view/browse.html.php
+1 -1
View File
@@ -102,7 +102,7 @@ $status = $this->session->testTaskVersionStatus;
</td>
<?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $task) . "</td>";?>
<td class='c-actions'>
<?php echo $this->buildOperateMenu($task, 'browse');?>
<?php echo $this->testtask->buildOperateMenu($task, 'browse');?>
</td>
</tr>
<?php endforeach;?>
module/testtask/view/view.html.php
+1 -1
View File
@@ -51,7 +51,7 @@
<div class="btn-toolbar">
<?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', 'btn btn-secondary');?>
<div class='divider'></div>
<?php echo $this->buildOperateMenu($task, 'view');?>
<?php echo $this->testtask->buildOperateMenu($task, 'view');?>
</div>
</div>
</div>