diff --git a/module/action/control.php b/module/action/control.php
index 0baf2fcad8..f962cdbfa1 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -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;
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 752c2d4ab7..6167da3e76 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -86,7 +86,7 @@
lang->execution->project;?> |
- lang->project->product;?> |
+ lang->story->product;?> |
lang->task->execution;?> |
diff --git a/module/story/model.php b/module/story/model.php
index b709a367e4..663540387f 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -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');