From 152b5921b2dff6699bc188fb99c270ada52d63fe Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Fri, 14 Dec 2012 03:14:56 +0000
Subject: [PATCH]  * code for task#949.

---
 module/search/lang/en.php    | 1 +
 module/search/lang/zh-cn.php | 1 +
 module/search/model.php      | 7 ++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index 8bbc1907e2..191c3f6325 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -26,6 +26,7 @@ $lang->search->setQueryTitle = 'Please input the title（execute searching befor
 $lang->search->storyTitle    = 'Story title';
 $lang->search->taskTitle     = 'Task title';
 $lang->search->select        = 'Stories/Tasks filter';
+$lang->search->me            = 'Me';
 
 $lang->search->operators['=']          = '=';
 $lang->search->operators['!=']         = '!=';
diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php
index 002aa44321..8db9d96358 100644
--- a/module/search/lang/zh-cn.php
+++ b/module/search/lang/zh-cn.php
@@ -26,6 +26,7 @@ $lang->search->setQueryTitle = '请输入查询标题（保存之前请先查询
 $lang->search->storyTitle    = '需求名称';
 $lang->search->taskTitle     = '任务名称';
 $lang->search->select        = '需求/任务筛选';
+$lang->search->me            = '自己';
 
 $lang->search->operators['=']          = '=';
 $lang->search->operators['!=']         = '!=';
diff --git a/module/search/model.php b/module/search/model.php
index 722a15d0ea..a14da1c625 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -72,6 +72,7 @@ class searchModel extends model
             /* Set operator. */
             $value    = $this->post->$valueName;
             $operator = $this->post->$operatorName;
+            if($value == '@me') $value = $this->app->user->account;
             if(!isset($this->lang->search->operators[$operator])) $operator = '=';
             if($operator == "include")
             {
@@ -172,7 +173,11 @@ class searchModel extends model
             if($params[$fieldName]['values'] == 'projects') $hasProject = true;
         }
 
-        if($hasUser)    $users    = $this->loadModel('user')->getPairs();
+        if($hasUser)    
+        {
+            $users        = $this->loadModel('user')->getPairs();
+            $users['@me'] = $this->lang->search->me;
+        }
         if($hasProduct) $products = array('' => '') + $this->loadModel('product')->getPairs();
         if($hasProject) $projects = array('' => '') + $this->loadModel('project')->getPairs();