diff --git a/module/bug/control.php b/module/bug/control.php index c507161027..cade39ca65 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -153,7 +153,7 @@ class bug extends control } /* 设置搜索表单。*/ - $this->config->bug->search['actionURL'] = $this->createLink('bug', 'browse', "productID=$productID&browseType=bySearch&queryID=queryID"); + $this->config->bug->search['actionURL'] = $this->createLink('bug', 'browse', "productID=$productID&browseType=bySearch&queryID=myQueryID"); $this->config->bug->search['queryID'] = $queryID; $this->config->bug->search['params']['product']['values'] = array($productID => $this->products[$productID], 'all' => $this->lang->bug->allProduct); $this->config->bug->search['params']['module']['values'] = $this->tree->getOptionMenu($productID, $viewType = 'bug', $rooteModuleID = 0); diff --git a/module/product/control.php b/module/product/control.php index 8d2fe06d60..0975670897 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -106,7 +106,7 @@ class product extends control } /* 设置搜索条件。*/ - $this->config->product->search['actionURL'] = $this->createLink('product', 'browse', "productID=$productID&browseType=bySearch&queryID=queryID"); + $this->config->product->search['actionURL'] = $this->createLink('product', 'browse', "productID=$productID&browseType=bySearch&queryID=myQueryID"); $this->config->product->search['queryID'] = $queryID; $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID); $this->view->searchForm = $this->fetch('search', 'buildForm', $this->config->product->search); diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index f2cdf3cffc..60f97cb09a 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -102,7 +102,7 @@ function saveQuery() function executeQuery(queryID) { if(!queryID) return; - location.href = actionURL.replace('queryID', queryID); + location.href = actionURL.replace('myQueryID', queryID); } /* 删除Query。*/ diff --git a/module/testcase/control.php b/module/testcase/control.php index b22ade8e43..6872be294a 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -100,7 +100,7 @@ class testcase extends control } /* 构造搜索表单。*/ - $this->config->testcase->search['actionURL'] = $this->createLink('testcase', 'browse', "productID=$productID&browseType=bySearch&queryID=queryID"); + $this->config->testcase->search['actionURL'] = $this->createLink('testcase', 'browse', "productID=$productID&browseType=bySearch&queryID=myQueryID"); $this->config->testcase->search['queryID'] = $queryID; $this->view->searchForm = $this->fetch('search', 'buildForm', $this->config->testcase->search); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index d61d63022a..ff59e480ce 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -161,7 +161,7 @@ class upgradeModel extends model $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1')); } - elseif($fromVersion == '1_0' || $fromVersion == '1_0_1') + elseif($fromVersion == '1_0rc2' || $fromVersion == '1_0' || $fromVersion == '1_0_1') { $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1')); } @@ -241,7 +241,7 @@ class upgradeModel extends model foreach($userConstants as $key => $value) { if(strpos($key, 'TABLE') === false) continue; - if($key == 'TABLE_COMPANY' or $key == 'TABLE_CONFIG') continue; + if($key == 'TABLE_COMPANY' or $key == 'TABLE_CONFIG' or $key == 'TABLE_USERQUERY') continue; $this->dbh->query("UPDATE $value SET company = '{$this->app->company->id}'"); } }