Merge branch 'sprint/master_lanzongjun_fixbug_version_biz' into 'master'

* fix bug #15274

See merge request easycorp/zentaopms!2386
This commit is contained in:
王怡栋
2022-03-22 00:32:33 +00:00
+3 -3
View File
@@ -180,9 +180,6 @@
</ul>
<?php endif;?>
</div>
<?php if($this->app->rawMethod == 'browseunits' and (empty($productID) or common::canModify('product', $product))):?>
<?php common::printLink('testtask', 'importUnitResult', "product=$productID", "<i class='icon icon-import'></i> " . $lang->testtask->importUnitResult, '', "class='btn btn-primary' data-app='{$this->app->tab}'");?>
<?php endif;?>
<?php else:?>
<div class='btn-group dropdown-hover'>
<?php
@@ -201,6 +198,9 @@
</ul>
</div>
<?php endif;?>
<?php if($this->app->rawMethod == 'browseunits' and (empty($productID) or common::canModify('product', $product))):?>
<?php common::printLink('testtask', 'importUnitResult', "product=$productID", "<i class='icon icon-import'></i> " . $lang->testtask->importUnitResult, '', "class='btn btn-primary' data-app='{$this->app->tab}'");?>
<?php endif;?>
<?php endif;?>
</div>
<?php endif;?>