diff --git a/trunk/module/common/control.php b/trunk/module/common/control.php
index dd9dbf6ea4..6dbe905715 100644
--- a/trunk/module/common/control.php
+++ b/trunk/module/common/control.php
@@ -127,7 +127,7 @@ EOT;
     /* ��ӡ���˵���*/
     public static function printMainmenu($moduleName)
     {
-        global $lang;
+        global $app, $lang;
         echo "<ul>\n";
         echo "<li>$lang->zentaoMS</li>\n";
 
@@ -147,9 +147,27 @@ EOT;
                 echo "<li $active><nobr><a href='$link'>$menuLabel</a></nobr></li>\n";
             }
         }
+
+        /* ��ӡ������*/
+        $moduleName = $app->getModuleName();
+        $methodName = $app->getMethodName();
+        $searchObject = $moduleName;
+        if($moduleName == 'product')
+        {
+           if($methodName == 'browse') $searchObject = 'story';
+        }
+        elseif($moduleName == 'project')
+        {
+            if(strpos('task|story|bug|build', $methodName) !== false) $searchObject = $methodName;
+        }
+        elseif($moduleName == 'my' or $moduleName == 'user')
+        {
+            $searchObject = $methodName;
+        }
+
         echo "<li id='searchbox'>"; 
-        echo html::select('searchType', $lang->searchObjects);
-        echo html::input('searchQuery', $lang->searchTips, "onclick=this.value=''; class='text-2'");
+        echo html::select('searchType', $lang->searchObjects, $searchObject);
+        echo html::input('searchQuery', $lang->searchTips, "onclick=this.value='' onkeydown='if(event.keyCode==13) shortcut()' class='text-2'");
         echo html::submitButton($lang->go, 'onclick="shortcut()"');
         echo "</li>";
         echo "</ul>\n";
diff --git a/trunk/module/common/lang/zh-cn.php b/trunk/module/common/lang/zh-cn.php
index 176b34d3da..923a8cddd1 100644
--- a/trunk/module/common/lang/zh-cn.php
+++ b/trunk/module/common/lang/zh-cn.php
@@ -71,11 +71,18 @@ $lang->menu->company = '组织视图|company|index';
 $lang->menu->admin   = '后台管理|admin|index';
 
 /* 查询条中可以选择的对象列表。*/
-$lang->searchObjects['story']   = '需求';
-$lang->searchObjects['task']    = '任务';
-$lang->searchObjects['bug']     = 'Bug';
-$lang->searchObjects['testcase']= '用例';
-$lang->searchTips               = '输入编号';
+$lang->searchObjects['bug']         = 'B:Bug';
+$lang->searchObjects['story']       = 'S:需求';
+$lang->searchObjects['task']        = 'T:任务';
+$lang->searchObjects['testcase']    = 'C:用例';
+$lang->searchObjects['project']     = 'P:项目';
+$lang->searchObjects['product']     = 'P:产品';
+$lang->searchObjects['user']        = 'U:用户';
+$lang->searchObjects['build']       = 'B:Build';
+$lang->searchObjects['release']     = 'R:发布';
+$lang->searchObjects['productplan'] = 'P:产品计划';
+$lang->searchObjects['testtask']    = 'T:测试任务';
+$lang->searchTips                   = '输入编号';
 
 /* 首页菜单设置。*/
 $lang->index->menu->product = '浏览产品|product|browse';