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

* Finish task #64972,64973.

Browse Source
This commit is contained in:
dongli
2022-08-23 07:15:16 +00:00
parent 57528ecba5
commit a825fa54ae
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/control.php
-1
View File
@@ -128,7 +128,6 @@ class action extends control
/* Get the products name of story. */
if($browseType == 'story')
{
$this->app->loadLang('project');
$this->loadModel('story');
$storyIdList = array();
foreach($trashes as $trash) $storyIdList[] = $trash->objectID;
module/action/view/trash.html.php
+1 -1
View File
@@ -86,7 +86,7 @@
<th class='w-250px'><?php echo $this->lang->execution->project;?></th>
<?php endif;?>
<?php if($currentObjectType == 'story'):?>
<th class='w-250px'><?php echo $this->lang->project->product;?></th>
<th class='w-250px'><?php echo $this->lang->story->product;?></th>
<?php endif;?>
<?php if($currentObjectType == 'task'):?>
<th class='w-250px'><?php echo $this->lang->task->execution;?></th>
module/story/model.php
+1 -1
View File
@@ -96,8 +96,8 @@ class storyModel extends model
->from(TABLE_STORY)->alias('t1')
->leftJoin(TABLE_STORYSPEC)->alias('t2')->on('t1.id=t2.story')
->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id')
->beginIF($mode != 'all')->andWhere('t1.deleted')->eq(0)->fi()
->where('t1.version=t2.version')
->beginIF($mode != 'all')->andWhere('t1.deleted')->eq(0)->fi()
->beginIF($storyIdList)->andWhere('t1.id')->in($storyIdList)->fi()
->beginIF(!$storyIdList)->andWhere('t1.type')->eq($type)->fi()
->fetchAll('id');