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

Merge branch 'sprint/tianshujie_fixbug' into 'master'

Browse Source 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4432
This commit is contained in:
王怡栋
2022-07-08 05:06:21 +00:00
parent b202420822 3213065954
commit 82401d1909
4 changed files with 6 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/browse.html.php
-33
View File
@@ -110,7 +110,6 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
</ul>
</div>
<?php if(common::canModify('product', $product)):?>
<?php if(!common::checkNotCN()):?>
<?php
$createBugLink = '';
$batchCreateLink = '';
@@ -150,38 +149,6 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
</ul>
<?php endif;?>
</div>
<?php else:?>
<div class='btn-group dropdown-hover'>
<?php
if(commonModel::isTutorialMode())
{
$wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
$link = $this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams");
echo html::a($link, "<i class='icon icon-plus'></i> {$lang->bug->create} </span><span class='caret'>", '', "class='btn btn-primary btn-bug-create'");
}
else
{
$link = $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID");
$disabled = '';
if(!common::hasPriv('bug', 'create'))
{
$link = '###';
$disabled = "disabled";
}
echo html::a($link, "<i class='icon icon-plus'></i> {$lang->bug->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled'");
}
?>
<ul class='dropdown-menu'>
<?php $disabled = common::hasPriv('bug', 'batchCreate') ? '' : "class='disabled'";?>
<li <?php echo $disabled?>>
<?php
$batchLink = $this->createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&executionID=0&moduleID=$moduleID");
echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i> " . $lang->bug->batchCreate) . "</li>";
?>
</li>
</ul>
</div>
<?php endif;?>
<?php endif;?>
</div>
<?php endif;?>
module/common/model.php
+2 -1
View File
@@ -2417,7 +2417,8 @@ EOD;
($module == 'file' and strpos('|read|download|uploadimages|ajaxwopifiles|', "|{$method}|") !== false) or
($module == 'sso' and $method == 'login') or
($module == 'report' && $method == 'annualdata') or
($module == 'traincourse' and $method == 'ajaxuploadlargefile'))
($module == 'traincourse' and $method == 'ajaxuploadlargefile') or
($module == 'traincourse' and $method == 'playvideo'))
{
return;
}
module/product/control.php
+1 -1
View File
@@ -241,7 +241,7 @@ class product extends control
$this->products = $this->product->getProducts($projectID, 'all', '', false);
$projectProducts = $this->product->getProducts($projectID);
$productPlans = $this->execution->getPlans($projectProducts);
$productPlans = $this->execution->getPlans($projectProducts, 'skipParent');
if($browseType == 'bybranch') $param = $branchID;
$stories = $this->story->getExecutionStories($projectID, $productID, $branchID, $sort, $browseType, $param, 'story', '', $pager);
module/testcase/view/caseheader.html.php
+3 -19
View File
@@ -3,6 +3,9 @@
<?php $currentModule = $isProjectApp ? 'project' : 'testcase';?>
<?php $currentMethod = $isProjectApp ? 'testcase' : 'browse';?>
<?php $projectParam = $isProjectApp ? "projectID={$this->session->project}&" : '';?>
<?php if(common::checkNotCN()):?>
<style> .btn-toolbar>.btn {margin-right: 3px !important;}</style>
<?php endif;?>
<?php if(!isset($branch)) $branch = 0;?>
<?php if($config->global->flow == 'full'):?>
<style>
@@ -147,7 +150,6 @@
</div>
<?php endif;?>
<?php $initModule = isset($moduleID) ? (int)$moduleID : 0;?>
<?php if(!common::checkNotCN()):?>
<div class='btn-group dropdown'>
<?php
$createTestcaseLink = $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule");
@@ -177,24 +179,6 @@
</ul>
<?php endif;?>
</div>
<?php else:?>
<div class='btn-group dropdown-hover'>
<?php
$link = common::hasPriv('testcase', 'create') ? $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule") : '###';
$disabled = common::hasPriv('testcase', 'create') ? '' : "disabled";
echo html::a($link, "<i class='icon icon-plus'></i> {$lang->testcase->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled' data-app={$this->app->tab}");
?>
<ul class='dropdown-menu'>
<?php $disabled = common::hasPriv('testcase', 'batchCreate') ? '' : "class='disabled'";?>
<li <?php echo $disabled?>>
<?php
$batchLink = $this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule");
echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i> " . $lang->testcase->batchCreate, '', "data-app='{$this->app->tab}'") . "</li>";
?>
</li>
</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;?>