From d715b2ab99e27bb841e74efb88d48b34cffb68d6 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 15 Mar 2018 13:33:34 +0800
Subject: [PATCH]  * finish task #3669.

---
 module/company/config.php  | 2 +-
 module/company/control.php | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/module/company/config.php b/module/company/config.php
index c5eced6fdf..f26840fd9d 100644
--- a/module/company/config.php
+++ b/module/company/config.php
@@ -22,7 +22,7 @@ $config->company->dynamic->search['params']['objectID']   = array('operator' =>
 $config->company->dynamic->search['params']['project']    = array('operator' => '=',  'control' => 'select', 'values' => '');
 $config->company->dynamic->search['params']['objectType'] = array('operator' => '=',  'control' => 'select', 'values' => $lang->action->search->objectTypeList);
 $config->company->dynamic->search['params']['date']       = array('operator' => '=',  'control' => 'input',  'values' => '', 'class' => 'date');
-$config->company->dynamic->search['params']['action']     = array('operator' => '=',  'control' => 'select', 'values' => $lang->action->search->label);
+$config->company->dynamic->search['params']['action']     = array('operator' => '=',  'control' => 'select', 'values' => '');
 
 $config->company->browse = new stdClass();
 $config->company->browse->search['module']             = 'user';
diff --git a/module/company/control.php b/module/company/control.php
index 61da51076a..1ee927491f 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -215,8 +215,15 @@ class company extends control
         ksort($products);
         $projects['all'] = $this->lang->project->allProject;
         $products['all'] = $this->lang->product->allProduct;
+
+        foreach($this->lang->action->search->label as $action => $name)
+        {
+            if($action) $this->lang->action->search->label[$action] .= " [ $action ]";
+        }
+
         $this->config->company->dynamic->search['actionURL'] = $this->createLink('company', 'dynamic', "browseType=bysearch&param=myQueryID");
         $this->config->company->dynamic->search['queryID']   = $queryID;
+        $this->config->company->dynamic->search['params']['action']['values']  = $this->lang->action->search->label;
         $this->config->company->dynamic->search['params']['project']['values'] = $projects;
         $this->config->company->dynamic->search['params']['product']['values'] = $products; 
         $this->config->company->dynamic->search['params']['actor']['values']   = $users;