Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #7957.

Browse Source
This commit is contained in:
tianshujie98
2020-09-30 13:13:08 +08:00
parent b8cd16bb07
commit 9980b2fc7f
6 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/lang/de.php
-1
View File
@@ -131,7 +131,6 @@ $lang->bug->allBugs = 'Alle';
$lang->bug->byQuery = 'Suche';
$lang->bug->needConfirm = 'Story geändert';
$lang->bug->allProduct = 'Alle' . $lang->productCommon;
$lang->bug->allProject = 'Alle' . $lang->projectCommon;
$lang->bug->my = 'Meine';
$lang->bug->yesterdayResolved = 'Gestern gelöst ';
$lang->bug->yesterdayConfirmed = 'Gestern bestätigt ';
module/bug/lang/en.php
-1
View File
@@ -131,7 +131,6 @@ $lang->bug->allBugs = 'All Bugs';
$lang->bug->byQuery = 'Search';
$lang->bug->needConfirm = 'Story Changed';
$lang->bug->allProduct = 'All' . $lang->productCommon . 's';
$lang->bug->allProject = 'All' . $lang->projectCommon . 's';
$lang->bug->my = 'My';
$lang->bug->yesterdayResolved = 'Bug Resolved Yesterday ';
$lang->bug->yesterdayConfirmed = 'Bug Confirmed Yesterday ';
module/bug/lang/fr.php
-1
View File
@@ -131,7 +131,6 @@ $lang->bug->allBugs = 'Tous';
$lang->bug->byQuery = 'Rechercher';
$lang->bug->needConfirm = 'Story Changée';
$lang->bug->allProduct = 'Tous les ' . $lang->productCommon . 's';
$lang->bug->allProject = 'Tous les ' . $lang->projectCommon . 's';
$lang->bug->my = 'Mes';
$lang->bug->yesterdayResolved = 'Bugs Résolus Hier ';
$lang->bug->yesterdayConfirmed = 'Bugs Confirmés Hier ';
module/bug/lang/vi.php
-1
View File
@@ -131,7 +131,6 @@ $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->allProduct = 'All' . $lang->productCommon;
$lang->bug->allProject = 'All' . $lang->projectCommon;
$lang->bug->my = 'Của bạn';
$lang->bug->yesterdayResolved = 'Giải quyết hôm qua ';
$lang->bug->yesterdayConfirmed = 'Xác nhận hôm qua ';
module/bug/lang/zh-cn.php
-1
View File
@@ -131,7 +131,6 @@ $lang->bug->allBugs = '所有';
$lang->bug->byQuery = '搜索';
$lang->bug->needConfirm = "{$lang->storyCommon}变动";
$lang->bug->allProduct = '所有' . $lang->productCommon;
$lang->bug->allProject = '所有' . $lang->projectCommon;
$lang->bug->my = '我的';
$lang->bug->yesterdayResolved = '昨天解决Bug数';
$lang->bug->yesterdayConfirmed = '昨天确认';
module/bug/model.php
+1 -10
View File
@@ -1303,7 +1303,7 @@ class bugModel extends model
$this->config->bug->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->bug->allProduct);
$this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID);
$this->config->bug->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0);
$this->config->bug->search['params']['project']['values'] = $this->product->getProjectPairs($productID) + array('all' => $this->lang->bug->allProject);
$this->config->bug->search['params']['project']['values'] = $this->product->getProjectPairs($productID);
$this->config->bug->search['params']['severity']['values'] = array(0 => '') + $this->lang->bug->severityList; //Fix bug #939.
$this->config->bug->search['params']['openedBuild']['values'] = $this->loadModel('build')->getProductBuildPairs($productID, 0, $params = '');
$this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
@@ -2362,15 +2362,6 @@ class bugModel extends model
$bugQuery = $bugQuery . ' AND `product` ' . helper::dbIN($products);
}
/* Fix bug #3356. */
$allProject = "`project` = 'all'";
if(strpos($bugQuery, $allProject) !== false)
{
$projects = $this->app->user->view->projects;
$bugQuery = str_replace($allProject, '1', $bugQuery);
$bugQuery = $bugQuery . ' AND `project` ' . helper::dbIN($projects);
}
$allBranch = "`branch` = 'all'";
if($branch and strpos($bugQuery, '`branch` =') === false) $bugQuery .= " AND `branch` in('0','$branch')";
if(strpos($bugQuery, $allBranch) !== false) $bugQuery = str_replace($allBranch, '1', $bugQuery);