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

Merge branch 'fixbug' into 'master'

Browse Source 
* Fix bug #23354.

See merge request easycorp/zentaopms!4203
This commit is contained in:
王怡栋
2022-06-29 00:48:57 +00:00
parent 1d0c857215 e656139643
commit da5b1d560c
6 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/leave/ext/view/browse.oa.html.hook.php
-1
View File
@@ -1 +0,0 @@
<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
extension/lite/leave/ext/view/create.oa.html.hook.php
-1
View File
@@ -1 +0,0 @@
<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
extension/lite/leave/ext/view/edit.oa.html.hook.php
-1
View File
@@ -1 +0,0 @@
<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
extension/lite/leave/ext/view/personalannual.oa.html.hook.php
-1
View File
@@ -1 +0,0 @@
<?php include $this->app->getExtensionRoot() . 'biz/leave/ext/view/' . basename(__FILE__);?>
module/execution/view/treestory.html.php
+2
View File
@@ -54,6 +54,7 @@
<td><?php common::printLink('product', 'browse', "productID=$story->product&branch=$story->branch", $branches[$story->branch], '', "data-app='product'");?></td>
</tr>
<?php endif;?>
<?php if($this->config->vision != 'lite'):?>
<tr>
<th><?php echo $lang->story->module;?></th>
<?php
@@ -101,6 +102,7 @@
?>
</td>
</tr>
<?php endif;?>
<tr>
<th><?php echo $lang->story->source;?></th>
<td id='source'><?php echo $story->source ? $lang->story->sourceList[$story->source] : $lang->noData;?></td>
module/todo/control.php
+1 -1
View File
@@ -593,7 +593,7 @@ class todo extends control
{
$issues = $this->loadModel('issue')->getUserIssuePairs($account);
$risks = $this->loadModel('risk')->getUserRiskPairs($account);
$opportunities = $this->loadModel('opprotunity')->getUserOpportunityPairs($account);
$opportunities = $this->loadModel('opportunity')->getUserOpportunityPairs($account);
}
$testTasks = $this->loadModel('testtask')->getUserTesttaskPairs($account);
if(isset($this->config->qcVersion)) $reviews = $this->loadModel('review')->getUserReviewPairs($account, 0, 'wait');