From 017192c8ad4b35c035cb8f3d1d72fa579ffae441 Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Tue, 13 Dec 2011 06:53:28 +0000
Subject: [PATCH]  fix the bug for assignto of task.

---
 module/bug/model.php           | 1 +
 module/group/lang/resource.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index 5c8bf47832..0d1e525bd6 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -129,6 +129,7 @@ class bugModel extends model
         return $this->dao->select('*')->from(TABLE_BUG)
             ->where('status')->eq('active')
             ->andWhere('toTask')->eq(0)
+            ->andWhere('tostory')->eq(0)
             ->andWhere('product')->in($products)
             ->andWhere('deleted')->eq(0)
             ->orderBy('id desc')
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index e51ef0ec89..cdfb588514 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -114,7 +114,7 @@ $lang->resource->project->ajaxGetProducts= 'ajaxGetProducts';
 $lang->resource->task->create              = 'create';
 $lang->resource->task->batchCreate         = 'batchCreate';
 $lang->resource->task->edit                = 'edit';
-$lang->resource->task->assign              = 'assign';
+$lang->resource->task->assignTo            = 'assign';
 $lang->resource->task->start               = 'start';
 $lang->resource->task->finish              = 'finish';
 $lang->resource->task->cancel              = 'cancel';