diff --git a/module/bug/config.php b/module/bug/config.php index cfc8c1ebad..d14ac64ac9 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -71,7 +71,7 @@ $config->bug->search['fields']['resolvedBy'] = $lang->bug->resolvedBy; $config->bug->search['fields']['status'] = $lang->bug->status; $config->bug->search['fields']['confirmed'] = $lang->bug->confirmed; -$config->bug->search['fields']['project'] = $lang->bug->project; +if($config->systemMode == 'new') $config->bug->search['fields']['project'] = $lang->bug->project; $config->bug->search['fields']['product'] = $lang->bug->product; $config->bug->search['fields']['branch'] = ''; $config->bug->search['fields']['plan'] = $lang->bug->productplan; @@ -115,7 +115,7 @@ $config->bug->search['params']['resolvedBy'] = array('operator' => '=', $config->bug->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->statusList); $config->bug->search['params']['confirmed'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->confirmedList); -$config->bug->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); +if($config->systemMode == 'new') $config->bug->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->bug->search['params']['product'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->bug->search['params']['branch'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->bug->search['params']['plan'] = array('operator' => '=', 'control' => 'select', 'values' => ''); diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php index d93bd7ddf6..1f24eae1ec 100644 --- a/module/bug/lang/de.php +++ b/module/bug/lang/de.php @@ -133,6 +133,7 @@ $lang->bug->overdueBugs = 'Überfällig'; $lang->bug->allBugs = 'Alle'; $lang->bug->byQuery = 'Suche'; $lang->bug->needConfirm = 'Story geändert'; +$lang->bug->allProject = 'All Projects'; $lang->bug->allProduct = 'Alle' . $lang->productCommon; $lang->bug->my = 'Meine'; $lang->bug->yesterdayResolved = 'Gestern gelöst '; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index b25c87ee1b..cfb0dba87c 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -140,7 +140,7 @@ $lang->bug->overdueBugs = 'Overdue'; $lang->bug->allBugs = 'All Bugs'; $lang->bug->byQuery = 'Search'; $lang->bug->needConfirm = 'Story Changed'; -$lang->bug->allProject = 'All ' . $lang->projectCommon . 's'; +$lang->bug->allProject = 'All Projects'; $lang->bug->allProduct = 'All ' . $lang->productCommon . 's'; $lang->bug->my = 'My'; $lang->bug->yesterdayResolved = 'Bug Resolved Yesterday '; diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index 2eed200247..fce872856d 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -133,6 +133,7 @@ $lang->bug->overdueBugs = 'Retard'; $lang->bug->allBugs = 'Tous'; $lang->bug->byQuery = 'Rechercher'; $lang->bug->needConfirm = 'Story Changée'; +$lang->bug->allProject = 'All Projects'; $lang->bug->allProduct = 'Tous les ' . $lang->productCommon . 's'; $lang->bug->my = 'Mes'; $lang->bug->yesterdayResolved = 'Bugs Résolus Hier '; diff --git a/module/bug/lang/vi.php b/module/bug/lang/vi.php index 9572429a46..2f0305172f 100644 --- a/module/bug/lang/vi.php +++ b/module/bug/lang/vi.php @@ -133,6 +133,7 @@ $lang->bug->overdueBugs = 'Quá hạn'; $lang->bug->allBugs = 'Tất cả Bugs'; $lang->bug->byQuery = 'Tìm kiếm'; $lang->bug->needConfirm = 'Câu chuyện đã thay đổi'; +$lang->bug->allProject = 'All Projects'; $lang->bug->allProduct = 'All' . $lang->productCommon; $lang->bug->my = 'Của bạn'; $lang->bug->yesterdayResolved = 'Giải quyết hôm qua '; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 5b44028f45..058bd29008 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -140,7 +140,7 @@ $lang->bug->overdueBugs = '过期Bug'; $lang->bug->allBugs = '所有'; $lang->bug->byQuery = '搜索'; $lang->bug->needConfirm = "{$lang->SRCommon}变动"; -$lang->bug->allProject = '所有' . $lang->projectCommon; +$lang->bug->allProject = '所有项目'; $lang->bug->allProduct = '所有' . $lang->productCommon; $lang->bug->my = '我的'; $lang->bug->yesterdayResolved = '昨天解决Bug数'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 423d9356c6..2534098a79 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -140,6 +140,7 @@ $lang->bug->overdueBugs = '過期Bug'; $lang->bug->allBugs = '所有'; $lang->bug->byQuery = '搜索'; $lang->bug->needConfirm = "{$lang->SRCommon}變動"; +$lang->bug->allProject = '所有項目'; $lang->bug->allProduct = '所有' . $lang->productCommon; $lang->bug->my = '我的'; $lang->bug->yesterdayResolved = '昨天解決Bug數'; diff --git a/module/bug/model.php b/module/bug/model.php index 7c1921308b..55565faf12 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1307,7 +1307,7 @@ class bugModel extends model $this->config->bug->search['actionURL'] = $actionURL; $this->config->bug->search['queryID'] = $queryID; - $this->config->bug->search['params']['project']['values'] = $projectParams; + if($this->config->systemMode == 'new') $this->config->bug->search['params']['project']['values'] = $projectParams; $this->config->bug->search['params']['product']['values'] = $productParams; $this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID); $this->config->bug->search['params']['module']['values'] = $modules;