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!2978
This commit is contained in:
李玉春
2022-04-18 03:30:09 +00:00
parent df7235355c ab1ad4051b
commit 4334eca80d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+5 -2
View File
@@ -571,7 +571,7 @@ class bug extends control
if($projectID)
{
$project = $this->loadModel('project')->getByID($projectID);
$projects = array($projectID => $project->name);
if(empty($bugID)) $projects = array($projectID => $project->name);
}
}
elseif($projectID)
@@ -581,7 +581,7 @@ class bug extends control
foreach($productList as $product) $products[$product->id] = $product->name;
$project = $this->loadModel('project')->getByID($projectID);
$projects += array($projectID => $project->name);
if(empty($bugID)) $projects += array($projectID => $project->name);
/* Set project menu. */
if($this->app->tab == 'project') $this->project->setMenu($projectID);
@@ -591,6 +591,9 @@ class bug extends control
$projects += $this->product->getProjectPairsByProduct($productID, $branch);
}
/* When copying bug, get all project linked to the product. */
if(!empty($bugID)) $projects += $this->product->getProjectPairsByProduct($productID, $branch);
/* Get block id of assinge to me. */
$blockID = 0;
if(isonlybody())
module/project/view/create.html.php
+1 -1
View File
@@ -125,7 +125,7 @@
<?php if(common::hasPriv('product', 'create')):?>
<span class='input-group-addon'>
<?php echo html::checkBox('newProduct', $lang->project->addProduct, '', "onchange=addNewProduct(this);");?>
<div><icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='top' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->project->productTip;?>"></icon></div>
<div><icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='left' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->project->productTip;?>"></icon></div>
</span>
<?php endif;?>
</div>