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

* Change judgment condition.

Browse Source
This commit is contained in:
Yagami
2023-05-04 18:57:45 +08:00
parent c4c20cae54
commit 5935f603f4
29 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/model.php
+1 -1
View File
@@ -2889,7 +2889,7 @@ class userModel extends model
$personalData['createdBugs'] = $this->dao->select($t1Count)->from(TABLE_BUG)->alias('t1')->leftjoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')->where('t1.openedBy')->eq($account)->andWhere('t1.deleted')->eq('0')->andWhere('t2.deleted')->eq('0')->fetch('count');
$personalData['resolvedBugs'] = $this->dao->select($t1Count)->from(TABLE_BUG)->alias('t1')->leftjoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')->where('t1.resolvedBy')->eq($account)->andWhere('t1.deleted')->eq('0')->andWhere('t2.deleted')->eq('0')->fetch('count');
$personalData['createdCases'] = $this->dao->select($count)->from(TABLE_CASE)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count');
if($this->config->edition== 'max' or $this->config->edition == 'ipd')
if($this->config->edition == 'max' or $this->config->edition == 'ipd')
{
$personalData['createdRisks'] = $this->dao->select($t1Count)->from(TABLE_RISK)->alias('t1')->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')->where('t1.createdBy')->eq($account)->andWhere('t1.deleted')->eq('0')->andWhere('t2.deleted')->eq('0')->fetch('count');
$personalData['resolvedRisks'] = $this->dao->select($t1Count)->from(TABLE_RISK)->alias('t1')->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')->where('t1.resolvedBy')->eq($account)->andWhere('t1.deleted')->eq('0')->andWhere('t2.deleted')->eq('0')->fetch('count');
module/user/view/execution.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
<tr>
<td><?php echo html::a($executionLink, $execution->id, '', "data-app='execution'");?></td>
<td>
<?php if($this->config->edition== 'max' or $this->config->edition == 'ipd'):?>
<?php if($this->config->edition == 'max' or $this->config->edition == 'ipd'):?>
<span class='project-type-label label label-info label-outline'><?php echo zget($lang->user->executionTypeList, $execution->type);?></span>
<?php endif;?>
<?php echo html::a($executionLink, $execution->name, '', "data-app='execution'");?>
module/user/view/featurebar.html.php
+1 -1
View File
@@ -46,7 +46,7 @@
common::printLink('user', 'execution', "userID={$user->id}", $label, '', "class='btn btn-link $active executionTab'");
}
if($this->config->edition== 'max' or $this->config->edition == 'ipd')
if($this->config->edition == 'max' or $this->config->edition == 'ipd')
{
$label = "<span class='text'>{$lang->user->issue}</span>";
$active = $methodName == 'issue' ? ' btn-active-text' : '';