From 2e8cc2c19f8dab556d109d48b80ab378f2d6d157 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 15 Aug 2022 19:37:05 +0800 Subject: [PATCH] * Restore code. --- module/build/control.php | 2 -- module/execution/control.php | 2 -- module/execution/model.php | 4 ---- module/mr/control.php | 2 -- module/my/model.php | 2 -- module/productplan/control.php | 2 -- module/release/control.php | 2 -- module/upgrade/model.php | 3 --- 8 files changed, 19 deletions(-) diff --git a/module/build/control.php b/module/build/control.php index d219c05da1..2989c210ea 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -659,8 +659,6 @@ class build extends control $this->config->bug->search['params']['execution']['values'] = $this->loadModel('product')->getExecutionPairsByProduct($build->product, $build->branch, 'id_desc', $this->session->project); $this->config->bug->search['params']['openedBuild']['values'] = $this->build->getBuildPairs($build->product, $branch = 'all', $params = ''); $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values']; - $this->config->bug->search['params']['os']['values'] = $this->bug->getObjectList('os'); - $this->config->bug->search['params']['browser']['values'] = $this->bug->getObjectList('browser'); unset($this->config->bug->search['fields']['product']); unset($this->config->bug->search['params']['product']); diff --git a/module/execution/control.php b/module/execution/control.php index 3f68656952..63b4722d59 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -635,8 +635,6 @@ class execution extends control $this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs(array_keys($products)); $this->config->bug->search['module'] = 'importBug'; $this->config->bug->search['params']['confirmed']['values'] = array('' => '') + $this->lang->bug->confirmedList; - $this->config->bug->search['params']['os']['values'] = $this->bug->getObjectList('os'); - $this->config->bug->search['params']['browser']['values'] = $this->bug->getObjectList('browser'); $this->loadModel('tree'); $bugModules = array(); diff --git a/module/execution/model.php b/module/execution/model.php index 8edc9a67b4..9944422cb3 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -3637,8 +3637,6 @@ class executionModel extends model */ public function buildBugSearchForm($products, $queryID, $actionURL, $type = 'execution') { - $this->loadModel('bug'); - $modules = array(); $builds = array('' => '', 'trunk' => $this->lang->trunk); foreach($products as $product) @@ -3694,8 +3692,6 @@ class executionModel extends model $this->config->bug->search['params']['module']['values'] = $modules; $this->config->bug->search['params']['openedBuild']['values'] = $builds; $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values']; - $this->config->bug->search['params']['os']['values'] = $this->bug->getObjectList('os'); - $this->config->bug->search['params']['browser']['values'] = $this->bug->getObjectList('browser'); if($productType == 'normal') { unset($this->config->bug->search['fields']['branch']); diff --git a/module/mr/control.php b/module/mr/control.php index 6f95b6313c..b9494df0ef 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -691,8 +691,6 @@ class mr extends control $this->config->bug->search['params']['openedBuild']['values'] = $this->loadModel('build')->getBuildPairs($productID, $branch = 'all', $params = ''); $this->config->bug->search['params']['resolvedBuild']['values'] = $this->loadModel('build')->getBuildPairs($productID, $branch = 'all', $params = ''); - $this->config->bug->search['params']['os']['values'] = $this->getObjectList('os'); - $this->config->bug->search['params']['browser']['values'] = $this->getObjectList('browser'); unset($this->config->bug->search['fields']['product']); if($product->type == 'normal') { diff --git a/module/my/model.php b/module/my/model.php index 71f058499d..6f359b99f1 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -652,8 +652,6 @@ class myModel extends model $this->config->bug->search['params']['severity']['values'] = array(0 => '') + $this->lang->bug->severityList; $this->config->bug->search['params']['openedBuild']['values'] = $this->loadModel('build')->getBuildPairs($products); $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values']; - $this->config->bug->search['params']['os']['values'] = $this->bug->getObjectList('os'); - $this->config->bug->search['params']['browser']['values'] = $this->bug->getObjectList('browser'); $this->loadModel('search')->setSearchParams($this->config->bug->search); } diff --git a/module/productplan/control.php b/module/productplan/control.php index 63347c894b..7e1cd9bd23 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -815,8 +815,6 @@ class productplan extends control $this->config->bug->search['params']['openedBuild']['values'] = $this->loadModel('build')->getBuildPairs($productID, $branch = 'all', $params = ''); $this->config->bug->search['params']['resolvedBuild']['values'] = $this->build->getBuildPairs($productID, $branch = 'all', $params = ''); $this->config->bug->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($plan->product, 'bug', 0, $plan->branch); - $this->config->bug->search['params']['os']['values'] = $this->bug->getObjectList('os'); - $this->config->bug->search['params']['browser']['values'] = $this->bug->getObjectList('browser'); if($this->config->systemMode == 'new') $this->config->bug->search['params']['project']['values'] = $this->product->getProjectPairsByProduct($productID, $plan->branch); unset($this->config->bug->search['fields']['product']); diff --git a/module/release/control.php b/module/release/control.php index 56567e1fcc..3c4c58a27d 100644 --- a/module/release/control.php +++ b/module/release/control.php @@ -589,8 +589,6 @@ class release extends control $this->config->bug->search['params']['openedBuild']['values'] = $this->loadModel('build')->getBuildPairs($release->product, $branch = 'all', $params = ''); $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values']; $this->config->bug->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($release->product, 'bug', 0, $release->branch); - $this->config->bug->search['params']['os']['values'] = $this->bug->getObjectList('os'); - $this->config->bug->search['params']['browser']['values'] = $this->bug->getObjectList('browser'); if($this->session->currentProductType == 'normal') { unset($this->config->bug->search['fields']['branch']); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index a664508eff..19ab13853b 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -531,9 +531,6 @@ class upgradeModel extends model $this->processBugLinkBug(); break; case '17_4': - $this->processCreatedInfo(); - $this->processCreatedBy(); - $this->updateApproval(); $this->rebuildFULLTEXT(); $this->updateSearchIndex(); if(!$executedXuanxuan)